Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv7055/src/gui
Modified Files:
wxOptionsDlg.cpp
Log Message:
fix crash when showing only text in the notebook tabs
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.368
retrieving revision 1.369
diff -b -u -2 -r1.368 -r1.369
--- wxOptionsDlg.cpp 1 Jun 2003 22:49:51 -0000 1.368
+++ wxOptionsDlg.cpp 20 Jun 2003 18:29:02 -0000 1.369
@@ -1587,5 +1587,5 @@
{ gettext_noop("&Splash screen at startup"), Field_Bool | Field_Restart, -1,
},
{ gettext_noop("Splash screen &delay"), Field_Number, ConfigField_Splash
},
- { gettext_noop("Show toolbar buttons &as"
+ { gettext_noop("Show toolbar buttons and notebook tabs &as"
":Images:Text:Both"), Field_Radio | Field_Restart, -1
},
{ gettext_noop("If autosave delay is not 0, the program will periodically\n"
@@ -2075,4 +2075,14 @@
m_aFields = aFields;
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 )
+ {
+ image = -1;
+ }
notebook->AddPage(this, title, FALSE /* don't select */, image);
-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
