X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/001e76a930e2bab71bcd4b1d40c4de4825cf6f47..fbfb8bcc3fa17e079d4219655b173f8ed2ccc65a:/src/generic/numdlgg.cpp diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp index 3fc475e4c5..d91c69e2a5 100644 --- a/src/generic/numdlgg.cpp +++ b/src/generic/numdlgg.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "numdlgg.cpp" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -108,13 +104,16 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent, #if wxUSE_STATTEXT // 1) text message topsizer->Add( CreateTextSizer( message ), 0, wxALL, 10 ); +#endif // 2) prompt and text ctrl wxBoxSizer *inputsizer = new wxBoxSizer( wxHORIZONTAL ); + +#if wxUSE_STATTEXT // prompt if any if (!prompt.IsEmpty()) inputsizer->Add( new wxStaticText( this, wxID_ANY, prompt ), 0, wxCENTER | wxLEFT, 10 ); -#endif +#endif // spin ctrl wxString valStr; @@ -123,11 +122,9 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent, #if wxUSE_SPINCTRL m_spinctrl->SetRange((int)m_min, (int)m_max); #endif -#if wxUSE_STATTEXT inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 ); // add both topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 ); -#endif // smart phones does not support or do not waste space for wxButtons #ifdef __SMARTPHONE__ @@ -149,10 +146,12 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent, SetSizer( topsizer ); SetAutoLayout( true ); +#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__) topsizer->SetSizeHints( this ); topsizer->Fit( this ); Centre( wxBOTH ); +#endif m_spinctrl->SetSelection(-1, -1); m_spinctrl->SetFocus();