Applied patch [ 670782 ] Combobox uses popup window width

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

diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index 17236fc66b1ffb5e07d4a92543ecea3e1a4c144a..397ae9af39a92c11c8d137d86006d2da32d65e45 100644 (file)
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -18,7 +18,6 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma interface "numdlgg.cpp"

     #pragma implementation "numdlgg.cpp"
 #endif
 
     #pragma implementation "numdlgg.cpp"
 #endif
 


@@ -29,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_NUMBERDLG
+

 #ifndef WX_PRECOMP
     #include <stdio.h>
 
 #ifndef WX_PRECOMP
     #include <stdio.h>
 


@@ -45,10 +46,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


@@ -82,6 +85,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
 
 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 ) );
     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 );


@@ -202,3 +208,5 @@ long wxGetNumberFromUser(const wxString& msg,
 
     return dialog.GetValue();
 }
 
     return dialog.GetValue();
 }

+
+#endif // wxUSE_NUMBERDLG