Undeprecate wxGetNumberFromUser, add wxNumberEntryDialog

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/include/wx/wxPython/wxPython_int.h b/wxPython/include/wx/wxPython/wxPython_int.h
index 514be3c08a2f3a9487a42466117a29351828334a..0a18e1a0444288f8585b83e5c4831d305225f068 100644 (file)
--- a/wxPython/include/wx/wxPython/wxPython_int.h
+++ b/wxPython/include/wx/wxPython/wxPython_int.h
@@ -29,6 +29,7 @@
 #include <wx/dcps.h>
 #include <wx/dirctrl.h>
 #include <wx/dirdlg.h>
+#include <wx/numdlg.h>
 #include <wx/dnd.h>
 #include <wx/docview.h>
 #include <wx/encconv.h>

diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i
index 47336f4d4fa520d84f9bcb78c1cce7171efacb35..8f961259825ae06c456df73995c92e97a9f45656 100644 (file)
--- a/wxPython/src/_cmndlgs.i
+++ b/wxPython/src/_cmndlgs.i
@@ -519,6 +519,30 @@ public:
 
 //---------------------------------------------------------------------------
 
+DocStr( wxNumberEntryDialog,
+"A dialog with spin control, ok and cancel buttons.", "")
+
+MustHaveApp(wxNumberEntryDialog);
+
+class wxNumberEntryDialog : public wxDialog
+{
+public:
+    %pythonAppend wxNumberEntryDialog   "self._setOORInfo(self)"
+    
+    DocCtorStr(
+        wxNumberEntryDialog(wxWindow *parent,
+                            const wxString& message,
+                            const wxString& prompt,
+                            const wxString& caption,
+                            long value, long min, long max,
+                            const wxPoint& pos = wxDefaultPosition),
+        "Constructor.  Use ShowModal method to show the dialog.", "");
+
+    long GetValue();
+};
+
+//---------------------------------------------------------------------------
+
 
 DocStr(wxFontData,
        "This class holds a variety of information related to font dialogs and

diff --git a/wxPython/src/_functions.i b/wxPython/src/_functions.i
index 7cc232d80457e3d0106c066c1eae5362d8d88a14..162f51e7771c76c7bf82537c24fd5554792460ee 100644 (file)
--- a/wxPython/src/_functions.i
+++ b/wxPython/src/_functions.i
@@ -241,8 +241,6 @@ int wxMessageBox(const wxString& message,
                  wxWindow *parent = NULL,
                  int x = -1, int y = -1);
 
-// WXWIN_COMPATIBILITY_2_4
-#if 0
 MustHaveApp(wxGetNumberFromUser);
 long wxGetNumberFromUser(const wxString& message,
                          const wxString& prompt,
@@ -251,8 +249,6 @@ long wxGetNumberFromUser(const wxString& message,
                          long min = 0, long max = 100,
                          wxWindow *parent = NULL,
                          const wxPoint& pos = wxDefaultPosition);
-%pythoncode { GetNumberFromUser = wx._deprecated(GetNumberFromUser) }
-#endif
 
 // GDI Functions