Update of /cvsroot/mahogany/M/include/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13704/include/gui
Modified Files:
wxDialogLayout.h wxOptionsPage.h
Log Message:
removed ConfigSource parameter from Profile::writeEntty(); added Profile:: and
MFolder::SetConfigSourceForWriting()
Index: wxDialogLayout.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxDialogLayout.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -b -u -2 -r1.80 -r1.81
--- wxDialogLayout.h 6 Jul 2005 22:02:04 -0000 1.80
+++ wxDialogLayout.h 7 Jul 2005 18:48:43 -0000 1.81
@@ -256,10 +256,4 @@
virtual bool TransferDataFromWindow();
- // get the config source to use for saving data: this must be passed to all
- // Profile::writeEntry() calls
- //
- // the returned pointer may be NULL and, in any case, shouldn't be deleted
- ConfigSource *GetConfigForSave() const { return m_configForSave; }
-
// callbacks
void OnHelp(wxCommandEvent &event);
@@ -267,4 +261,7 @@
void OnApply(wxCommandEvent& event);
void OnCancel(wxCommandEvent& event);
+ void OnConfigSourceChange(wxCommandEvent& event);
+
+ virtual void EndModal(int rc);
// unimplemented default ctor for DECLARE_DYNAMIC_CLASS
@@ -303,9 +300,6 @@
*m_btnApply;
- // choice containing all config sources, may be NULL
- wxChoice *m_chcSources;
-
- // config source to save changes to
- ConfigSource *m_configForSave;
+ // Ok/Cancel/Apply depending on the last button pressed
+ MEventOptionsChangeData::ChangeKind m_lastBtn;
// this profile is first retrieved using GetProfile(), but it's only done
@@ -315,4 +309,14 @@
Profile *m_profileForButtons;
+ // choice containing all config sources, may be NULL
+ wxChoice *m_chcSources;
+
+ // original config source used by profile returned by GetProfile(): only
+ // valid if m_changedConfigSource == true
+ ConfigSource *m_configOld;
+
+ // true if we had called SetConfigSourceForWriting() on our profile
+ bool m_changedConfigSource;
+
// flags
bool m_bDirty, // something changed
@@ -321,7 +325,4 @@
- // Ok/Cancel/Apply depending on the last button pressed
- MEventOptionsChangeData::ChangeKind m_lastBtn;
-
DECLARE_DYNAMIC_CLASS_NO_COPY(wxOptionsEditDialog)
DECLARE_EVENT_TABLE()
Index: wxOptionsPage.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxOptionsPage.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -b -u -2 -r1.70 -r1.71
--- wxOptionsPage.h 6 Jul 2005 22:05:39 -0000 1.70
+++ wxOptionsPage.h 7 Jul 2005 18:48:44 -0000 1.71
@@ -204,12 +204,4 @@
}
- // get the config source to use for saving
- ConfigSource *GetConfigForSave() const
- {
- wxOptionsEditDialog *dialog = GetOptionsDialog();
- return dialog ? dialog->GetConfigForSave() : NULL;
- }
-
-
// range of our controls in m_aFields
size_t m_nFirst, m_nLast;
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
