Update of /cvsroot/mahogany/M/src/util
In directory sc8-pr-cvs1:/tmp/cvs-serv5728
Modified Files:
upgrade.cpp
Log Message:
warning fix
Index: upgrade.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/util/upgrade.cpp,v
retrieving revision 1.204
retrieving revision 1.205
diff -b -u -2 -r1.204 -r1.205
--- upgrade.cpp 21 Jul 2003 00:22:36 -0000 1.204
+++ upgrade.cpp 22 Jul 2003 17:58:15 -0000 1.205
@@ -769,4 +769,19 @@
: InstallWizardPage(wizard, InstallWizard_WelcomePage)
{
+ 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, _(
"Welcome to Mahogany!\n"
@@ -788,19 +803,4 @@
));
- 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
wxBoxSizer *pageSizer = new wxBoxSizer(wxVERTICAL);
pageSizer->Add(
@@ -819,5 +819,5 @@
SetSizer(pageSizer);
pageSizer->Fit(this);
-#endif
+#endif // 2.5.x
}
-------------------------------------------------------
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
