Put wxContextHelp into cshelp.h/cpp, added wxContextHelpButton

[wxWidgets.git] / src / generic / numdlgg.cpp

diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index 7825d598204ab6195790a4fb2b3a0e650437bd72..96bbc485bf29186fd3758aa3b392fff40a55fc64 100644 (file)
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -45,10 +45,12 @@
   #include "wx/statline.h"
 #endif
 
   #include "wx/statline.h"
 #endif
 

+#if !defined(__WIN16__) && wxUSE_SPINCTRL

 #include "wx/spinctrl.h"
 #include "wx/spinctrl.h"

+#endif

 
 // this is where wxGetNumberFromUser() is declared
 
 // this is where wxGetNumberFromUser() is declared

-#include "wx/generic/textdlgg.h"
+#include "wx/textdlg.h"

 
 #if !wxUSE_SPINCTRL
     // wxTextCtrl will do instead of wxSpinCtrl if we don't have it
 
 #if !wxUSE_SPINCTRL
     // wxTextCtrl will do instead of wxSpinCtrl if we don't have it


@@ -129,7 +131,9 @@ wxNumberEntryDialog::wxNumberEntryDialog(wxWindow *parent,
     wxString valStr;
     valStr.Printf(wxT("%lu"), m_value);
     m_spinctrl = new wxSpinCtrl(this, -1, valStr, wxDefaultPosition, wxSize( 140, -1 ) );
     wxString valStr;
     valStr.Printf(wxT("%lu"), m_value);
     m_spinctrl = new wxSpinCtrl(this, -1, valStr, wxDefaultPosition, wxSize( 140, -1 ) );

-    m_spinctrl -> SetRange(m_min, m_max);
+#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 );
     inputsizer->Add( m_spinctrl, 1, wxCENTER | wxLEFT | wxRIGHT, 10 );
     // add both
     topsizer->Add( inputsizer, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );