Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8978/src/gui
Modified Files:
wxDialogLayout.cpp
Log Message:
extracted check whether to put images in the notebook in a separate
wxNoteebokWithImages::ShouldShowImages() method
Index: wxDialogLayout.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxDialogLayout.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -b -u -2 -r1.106 -r1.107
--- wxDialogLayout.cpp 15 May 2004 16:37:48 -0000 1.106
+++ wxDialogLayout.cpp 11 Jul 2004 19:07:33 -0000 1.107
@@ -438,8 +438,6 @@
// ----------------------------------------------------------------------------
-wxNotebookWithImages::wxNotebookWithImages(const wxString& configPath,
- wxWindow *parent,
- const wxChar *aszImages[])
- : wxPNotebook(configPath, parent, -1)
+/* static */
+bool wxNotebookWithImages::ShouldShowIcons()
{
// assume that if the user doesn't want to see the images in the toolbar, he
@@ -448,5 +446,13 @@
//
// NB: the config values are shifted related to the enum values, hence "+1"
- if ( (int)READ_APPCONFIG(MP_TBARIMAGES) + 1 != TbarShow_Text )
+ return (int)READ_APPCONFIG(MP_TBARIMAGES) + 1 != TbarShow_Text;
+}
+
+wxNotebookWithImages::wxNotebookWithImages(const wxString& configPath,
+ wxWindow *parent,
+ const wxChar *aszImages[])
+ : wxPNotebook(configPath, parent, -1)
+{
+ if ( ShouldShowIcons() )
{
wxImageList *imageList = new wxImageList(32, 32, TRUE, WXSIZEOF(aszImages));
-------------------------------------------------------
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
