From 62675ef3b7e75fb9f91f4192d9ffe7d882d6ea5a Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sat, 2 Apr 2005 17:25:50 +0000 Subject: [PATCH] Removed unnecesary statusbar; check for spin control presence git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/dialogs/dialogs.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index 7716fb5881..5a1f34d91b 100644 --- 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 @@ -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,6 +1480,7 @@ 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 ); -- 2.45.2