made it more obvious what to change in case of binary compatibility breakage (but...

[wxWidgets.git] / samples / dialogs / dialogs.cpp

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 7716fb588199380762bd2bcba363060b5940de13..d6a012f9cabe7ca206588862ddc5801a56991e90 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -74,7 +74,10 @@
     #include "wx/fdrepdlg.h"
 #endif // wxUSE_FINDREPLDLG
 
+#if wxUSE_SPINCTRL
 #include "wx/spinctrl.h"
+#endif
+
 #include "wx/propdlg.h"
 
 #include "dialogs.h"
@@ -407,10 +410,6 @@ MyFrame::MyFrame(wxWindow *parent,
         );
     }
 #endif // wxUSE_COLOURDLG
-
-#if wxUSE_STATUSBAR
-    CreateStatusBar();
-#endif // wxUSE_STATUSBAR
 }
 
 #if wxUSE_COLOURDLG
@@ -1368,9 +1367,9 @@ END_EVENT_TABLE()
 
 SettingsDialog::SettingsDialog(wxWindow* win)
 {
-    SetExtraStyle(wxDIALOG_EX_CONTEXTHELP);
+    SetExtraStyle(wxDIALOG_EX_CONTEXTHELP|wxWS_EX_VALIDATE_RECURSIVELY);
 
-    Create(win, -1, _("Preferences"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
+    Create(win, -1, _("Preferences"), wxDefaultPosition, wxDefaultSize);
     CreateButtons(wxOK|wxCANCEL|wxHELP);
 
     wxBookCtrlBase* notebook = GetBookCtrl();
@@ -1405,11 +1404,16 @@ wxPanel* SettingsDialog::CreateGeneralSettingsPage(wxWindow* parent)
 
     wxBoxSizer* itemSizer12 = new wxBoxSizer( wxHORIZONTAL );
     wxCheckBox* checkBox12 = new wxCheckBox(panel, ID_AUTO_SAVE, autoSaveLabel, wxDefaultPosition, wxDefaultSize);
+
+#if wxUSE_SPINCTRL
     wxSpinCtrl* spinCtrl12 = new wxSpinCtrl(panel, ID_AUTO_SAVE_MINS, wxEmptyString,
         wxDefaultPosition, wxSize(40, -1), wxSP_ARROW_KEYS, 1, 60, 1);
+#endif
     
     itemSizer12->Add(checkBox12, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
+#if wxUSE_SPINCTRL
     itemSizer12->Add(spinCtrl12, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
+#endif
     itemSizer12->Add(new wxStaticText(panel, wxID_STATIC, minsLabel), 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
     item0->Add(itemSizer12, 0, wxGROW|wxALL, 0);
 
@@ -1465,6 +1469,7 @@ wxPanel* SettingsDialog::CreateAestheticSettingsPage(wxWindow* parent)
 
     styleSizer->Add(itemSizer2, 0, wxGROW|wxALL, 5);
 
+#if wxUSE_SPINCTRL
     //// FONT SIZE SELECTION
 
     wxStaticBox* staticBox1 = new wxStaticBox(panel, -1, _("Tile font size:"));
@@ -1475,8 +1480,10 @@ wxPanel* SettingsDialog::CreateAestheticSettingsPage(wxWindow* parent)
     itemSizer5->Add(spinCtrl, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
 
     item0->Add(itemSizer5, 0, wxGROW|wxLEFT|wxRIGHT, 5);
+#endif
 
     topSizer->Add( item0, 1, wxGROW|wxALIGN_CENTRE|wxALL, 5 );
+    topSizer->AddSpacer(5);
 
     panel->SetSizer(topSizer);
     topSizer->Fit(panel);