Merged modifications from the 2.6 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-30 23:02:03 +00:00
parent a780a8dc19
commit 02b800ce7c
104 changed files with 14102 additions and 46560 deletions
--- a/wxPython/src/_functions.i
+++ b/wxPython/src/_functions.i
@@ -214,7 +214,9 @@ 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

 MustHaveApp(wxColourDisplay);