Undeprecate wxGetNumberFromUser, add wxNumberEntryDialog

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-07-06 22:15:24 +00:00
parent 2b73a34e1b
commit 9165401fbe
3 changed files with 25 additions and 4 deletions

View File

@@ -29,6 +29,7 @@
#include <wx/dcps.h> #include <wx/dcps.h>
#include <wx/dirctrl.h> #include <wx/dirctrl.h>
#include <wx/dirdlg.h> #include <wx/dirdlg.h>
#include <wx/numdlg.h>
#include <wx/dnd.h> #include <wx/dnd.h>
#include <wx/docview.h> #include <wx/docview.h>
#include <wx/encconv.h> #include <wx/encconv.h>

View File

@@ -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, DocStr(wxFontData,
"This class holds a variety of information related to font dialogs and "This class holds a variety of information related to font dialogs and

View File

@@ -241,8 +241,6 @@ int wxMessageBox(const wxString& message,
wxWindow *parent = NULL, wxWindow *parent = NULL,
int x = -1, int y = -1); int x = -1, int y = -1);
// WXWIN_COMPATIBILITY_2_4
#if 0
MustHaveApp(wxGetNumberFromUser); MustHaveApp(wxGetNumberFromUser);
long wxGetNumberFromUser(const wxString& message, long wxGetNumberFromUser(const wxString& message,
const wxString& prompt, const wxString& prompt,
@@ -251,8 +249,6 @@ long wxGetNumberFromUser(const wxString& message,
long min = 0, long max = 100, long min = 0, long max = 100,
wxWindow *parent = NULL, wxWindow *parent = NULL,
const wxPoint& pos = wxDefaultPosition); const wxPoint& pos = wxDefaultPosition);
%pythoncode { GetNumberFromUser = wx._deprecated(GetNumberFromUser) }
#endif
// GDI Functions // GDI Functions