Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3164/src/gui
Modified Files:
wxOptionsDlg.cpp
Log Message:
added delayed construction of wxOptionsPage[Dynamic]
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.411
retrieving revision 1.412
diff -b -u -2 -r1.411 -r1.412
--- wxOptionsDlg.cpp 8 Jul 2004 15:21:42 -0000 1.411
+++ wxOptionsDlg.cpp 11 Jul 2004 21:41:52 -0000 1.412
@@ -2231,4 +2231,19 @@
: wxNotebookPageBase(notebook)
{
+ Create(aFields, aDefaults, nFirst, nLast, notebook, title,
+ profile, helpId, image);
+}
+
+
+bool wxOptionsPage::Create(FieldInfoArray aFields,
+ ConfigValuesArray aDefaults,
+ size_t nFirst,
+ size_t nLast,
+ wxNotebook *notebook,
+ const wxChar *title,
+ Profile *profile,
+ int helpId,
+ int image)
+{
// no listbox by default
m_lboxData = NULL;
@@ -2237,10 +2252,5 @@
m_aDefaults = aDefaults;
- // assume that if the user doesn't want to see the images in the toolbar, he
- // doesn't want to see them elsewhere, in particular in the notebook tabs
- // neither
- //
- // NB: the config values are shifted related to the enum values, hence "+1"
- if ( (int)READ_APPCONFIG(MP_TBARIMAGES) + 1 == TbarShow_Text )
+ if ( !wxNotebookWithImages::ShouldShowIcons() )
{
image = -1;
@@ -2258,4 +2268,6 @@
CreateControls();
+
+ return true;
}
@@ -3166,4 +3178,29 @@
}
+bool
+wxOptionsPageDynamic::Create(wxNotebook *parent,
+ const wxChar *title,
+ Profile *profile,
+ FieldInfoArray aFields,
+ ConfigValuesArray aDefaults,
+ size_t nFields,
+ size_t nOffset,
+ int helpID,
+ int image)
+{
+ return wxOptionsPage::Create
+ (
+ aFields - nOffset,
+ aDefaults - nOffset,
+ nOffset,
+ nOffset + nFields,
+ parent,
+ title,
+ profile,
+ helpID,
+ image
+ );
+}
+
// ----------------------------------------------------------------------------
// wxOptionsPageStandard
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
