X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/470d5a67693a5615227a4b449750afd52fc18cfb..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/generic/numdlgg.cpp diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp index 22455856f9..a259657828 100644 --- a/src/generic/numdlgg.cpp +++ b/src/generic/numdlgg.cpp @@ -6,7 +6,7 @@ // Created: 23.07.99 // RCS-ID: $Id$ // Copyright: (c) Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,8 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma interface "numdlgg.cpp" +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "numdlgg.cpp" #endif @@ -29,6 +28,8 @@ #pragma hdrstop #endif +#if wxUSE_NUMBERDLG + #ifndef WX_PRECOMP #include @@ -45,7 +46,9 @@ #include "wx/statline.h" #endif +#if !defined(__WIN16__) && wxUSE_SPINCTRL #include "wx/spinctrl.h" +#endif // this is where wxGetNumberFromUser() is declared #include "wx/textdlg.h" @@ -82,6 +85,7 @@ protected: private: DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxNumberEntryDialog) }; // ============================================================================ @@ -129,7 +133,9 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent, wxString valStr; valStr.Printf(wxT("%lu"), m_value); m_spinctrl = new wxSpinCtrl(this, -1, valStr, wxDefaultPosition, wxSize( 140, -1 ) ); +#if !defined(__WIN16__) && wxUSE_SPINCTRL m_spinctrl->SetRange((int)m_min, (int)m_max); +#endif inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 ); // add both topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 ); @@ -202,3 +208,5 @@ long wxGetNumberFromUser(const wxString& msg, return dialog.GetValue(); } + +#endif // wxUSE_NUMBERDLG