Update of /cvsroot/mahogany/M/src/util
In directory sc8-pr-cvs1:/tmp/cvs-serv15771/src/util
Modified Files:
upgrade.cpp
Log Message:
fixed first wizard page for wxWin 2.4
Index: upgrade.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/util/upgrade.cpp,v
retrieving revision 1.207
retrieving revision 1.208
diff -b -u -2 -r1.207 -r1.208
--- upgrade.cpp 23 Jul 2003 00:59:23 -0000 1.207
+++ upgrade.cpp 23 Jul 2003 12:05:39 -0000 1.208
@@ -786,18 +786,8 @@
m_useWizard = true;
- m_checkbox = new wxCheckBox
- (
- this, -1,
- _("I'm an &expert and don't need the wizard")
- );
-
-#if !wxCHECK_VERSION(2,5,0)
- wxSize sizeBox = m_checkbox->GetSize(),
- sizePage = wizard->GetPageSize();
-
- // adjust the vertical position
- m_checkbox->Move(5, sizePage.y - 2*sizeBox.y);
-#else // 2.5.x
- wxStaticText *introduction = new wxStaticText(this, -1, _(
+#if wxCHECK_VERSION(2,5,0)
+ wxStaticText *introduction =
+#endif // 2.5.0+
+ new wxStaticText(this, -1, _(
"Welcome to Mahogany!\n"
"\n"
@@ -805,5 +795,5 @@
"important settings needed to successfully use\n"
"the program. You don't need to specify all of\n"
- "them here and now - you can always change all\n"
+ "them here and now -- you can always change all\n"
"the program options later from the \"Preferences\"\n"
"dialog accessible via the \"Edit\" menu.\n"
@@ -812,5 +802,5 @@
"working default configuration and we advise you\n"
"to complete it, especially if you are new to\n"
- "Mahogany.\n"
+ "Mahogany, so please take time to complete it.\n"
"\n"
"If you still decide to not use it, just check\n"
@@ -818,4 +808,17 @@
));
+ m_checkbox = new wxCheckBox
+ (
+ this, -1,
+ _("I'm an &expert and don't need the wizard")
+ );
+
+#if !wxCHECK_VERSION(2,5,0)
+ wxSize sizeBox = m_checkbox->GetSize(),
+ sizePage = wizard->GetPageSize();
+
+ // adjust the vertical position
+ m_checkbox->Move(5, sizePage.y - 2*sizeBox.y);
+#else // 2.5.x
wxBoxSizer *pageSizer = new wxBoxSizer(wxVERTICAL);
pageSizer->Add(
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the
same time. Free trial click here: http://www.vmware.com/wl/offer/345/0
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
