Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20757/src/gui
Modified Files:
wxDialogLayout.cpp wxOptionsDlg.cpp
Log Message:
fixed crash when cancel was pressed in the spam options dialog (profile used by
optiosn dialog was sometimes released by it and sometimes not; never do it now)
Index: wxDialogLayout.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxDialogLayout.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -b -u -2 -r1.105 -r1.106
--- wxDialogLayout.cpp 10 Feb 2004 22:44:06 -0000 1.105
+++ wxDialogLayout.cpp 15 May 2004 16:37:48 -0000 1.106
@@ -1333,4 +1333,5 @@
if ( m_profileForButtons )
{
+ m_profileForButtons->IncRef();
m_profileForButtons->Suspend();
}
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.405
retrieving revision 1.406
diff -b -u -2 -r1.405 -r1.406
--- wxOptionsDlg.cpp 21 Apr 2004 21:54:20 -0000 1.405
+++ wxOptionsDlg.cpp 15 May 2004 16:37:48 -0000 1.406
@@ -601,10 +601,13 @@
static const wxChar *ms_aszImages[];
+ // ctor
wxOptionsNotebook(wxWindow *parent);
- // the profile we use - just the global one here
- Profile *GetProfile() const { return Profile::CreateProfile(_T("")); }
+ // the profile we use: just the global one here
+ Profile *GetProfile() const { return mApplication->GetProfile(); }
private:
+ Profile *m_profile;
+
DECLARE_NO_COPY_CLASS(wxOptionsNotebook)
};
@@ -4508,6 +4511,4 @@
#endif // USE_TEST_PAGE
new wxOptionsPageOthers(this, profile);
-
- profile->DecRef();
}
-------------------------------------------------------
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562&alloc_id=6184&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
