From 9165401fbedc620814401be5e6d6729dfa59c311 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 6 Jul 2006 22:15:24 +0000 Subject: [PATCH] Undeprecate wxGetNumberFromUser, add wxNumberEntryDialog git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/include/wx/wxPython/wxPython_int.h | 1 + wxPython/src/_cmndlgs.i | 24 +++++++++++++++++++++ wxPython/src/_functions.i | 4 ---- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/wxPython/include/wx/wxPython/wxPython_int.h b/wxPython/include/wx/wxPython/wxPython_int.h index 514be3c08a..0a18e1a044 100644 --- a/wxPython/include/wx/wxPython/wxPython_int.h +++ b/wxPython/include/wx/wxPython/wxPython_int.h @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i index 47336f4d4f..8f96125982 100644 --- 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 7cc232d804..162f51e777 100644 --- 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 -- 2.47.2