Update of /cvsroot/mahogany/M/include/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8572/include/gui
Modified Files:
wxDialogLayout.h
Log Message:
implemented CreateControlsBelow() to show the choice containing available
config sources, if applicable
Index: wxDialogLayout.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxDialogLayout.h,v
retrieving revision 1.79
retrieving revision 1.80
diff -b -u -2 -r1.79 -r1.80
--- wxDialogLayout.h 27 Sep 2004 13:41:13 -0000 1.79
+++ wxDialogLayout.h 6 Jul 2005 22:02:04 -0000 1.80
@@ -224,6 +224,6 @@
// create the notebook itself (assign the pointer to m_notebook)
virtual void CreateNotebook(wxPanel *panel) = 0;
- // create the controls below the main notebook
- virtual void CreateControlsBelow(wxPanel * /* panel */) { }
+ // create the controls below the main notebook, return the top-most
+ virtual wxControl *CreateControlsBelow(wxPanel *panel);
// create the notebook and the standard Ok/Cancel/Apply buttons, calls
// CreateControlsAbove/Below() and CreateNotebook() which may be
@@ -256,4 +256,10 @@
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);
@@ -282,9 +288,11 @@
bool DoApply();
- wxPNotebook *m_notebook;
-
// get the profile for event sending
virtual Profile *GetProfile() const = 0;
+
+ // the notebook occupying the main part of the dialog
+ wxPNotebook *m_notebook;
+
private:
// send a notification event about options change using m_lastBtn value
@@ -295,4 +303,10 @@
*m_btnApply;
+ // choice containing all config sources, may be NULL
+ wxChoice *m_chcSources;
+
+ // config source to save changes to
+ ConfigSource *m_configForSave;
+
// this profile is first retrieved using GetProfile(), but it's only done
// once and then it is reused so that [Cancel] will call Discard() on the
-------------------------------------------------------
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
