X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/095315e20d117d292ea01f8f964b19c032a0fd56..7e664d85e6512d807ce2eb186ed9e0bbd60d6e8b:/wxPython/src/_functions.i?ds=sidebyside

diff --git a/wxPython/src/_functions.i b/wxPython/src/_functions.i
index d9e76c0769..162f51e777 100644
--- a/wxPython/src/_functions.i
+++ b/wxPython/src/_functions.i
@@ -52,12 +52,54 @@ MustHaveApp(wxEndBusyCursor);
 void wxEndBusyCursor();
 
 long wxGetElapsedTime(bool resetTimer = true);
-
+%pythoncode { GetElapsedTime = wx._deprecated(GetElapsedTime) }
+    
 bool wxIsBusy();
 wxString wxNow();
 bool wxShell(const wxString& command = wxPyEmptyString);
 void wxStartTimer();
 
+
+
+enum
+{
+    wxUNKNOWN_PLATFORM,
+    wxCURSES,                 /*  Text-only CURSES */
+    wxXVIEW_X,                /*  Sun's XView OpenLOOK toolkit */
+    wxMOTIF_X,                /*  OSF Motif 1.x.x */
+    wxCOSE_X,                 /*  OSF Common Desktop Environment */
+    wxNEXTSTEP,               /*  NeXTStep */
+    wxMAC,                    /*  Apple Mac OS 8/9/X with Mac paths */
+    wxMAC_DARWIN,             /*  Apple Mac OS X with Unix paths */
+    wxBEOS,                   /*  BeOS */
+    wxGTK,                    /*  GTK on X */
+    wxGTK_WIN32,              /*  GTK on Win32 */
+    wxGTK_OS2,                /*  GTK on OS/2 */
+    wxGTK_BEOS,               /*  GTK on BeOS */
+    wxGEOS,                   /*  GEOS */
+    wxOS2_PM,                 /*  OS/2 Workplace */
+    wxWINDOWS,                /*  Windows or WfW */
+    wxMICROWINDOWS,           /*  MicroWindows */
+    wxPENWINDOWS,             /*  Windows for Pen Computing */
+    wxWINDOWS_NT,             /*  Windows NT */
+    wxWIN32S,                 /*  Windows 32S API */
+    wxWIN95,                  /*  Windows 95 */
+    wxWIN386,                 /*  Watcom 32-bit supervisor modus */
+    wxWINDOWS_CE,             /*  Windows CE (generic) */
+    wxWINDOWS_POCKETPC,       /*  Windows CE PocketPC */
+    wxWINDOWS_SMARTPHONE,     /*  Windows CE Smartphone */
+    wxMGL_UNIX,               /*  MGL with direct hardware access */
+    wxMGL_X,                  /*  MGL on X */
+    wxMGL_WIN32,              /*  MGL on Win32 */
+    wxMGL_OS2,                /*  MGL on OS/2 */
+    wxMGL_DOS,                /*  MGL on MS-DOS */
+    wxWINDOWS_OS2,            /*  Native OS/2 PM */
+    wxUNIX,                   /*  wxBase under Unix */
+    wxX11,                    /*  Plain X11 and Universal widgets */
+    wxPALMOS,                 /*  PalmOS */
+    wxDOS                     /*  wxBase under MS-DOS */
+};
+
 DocDeclA(
     int, wxGetOsVersion(int *OUTPUT, int *OUTPUT),
     "GetOsVersion() -> (platform, major, minor)");
@@ -199,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,
@@ -209,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
 
@@ -426,40 +464,5 @@ MustHaveApp(wxThread);
     }
 %}
 
-//---------------------------------------------------------------------------
-
-// enum wxPowerType
-// {
-//     wxPOWER_SOCKET,
-//     wxPOWER_BATTERY,
-//     wxPOWER_UNKNOWN
-// };
-
-// DocDeclStr(
-//     wxPowerType , wxGetPowerType(),
-//     "Returns the type of power source as one of wx.POWER_SOCKET,
-// wx.POWER_BATTERY or wx.POWER_UNKNOWN.  wx.POWER_UNKNOWN is also the
-// default on platforms where this feature is not implemented.", "");
-
-
-// enum wxBatteryState
-// {
-//     wxBATTERY_NORMAL_STATE,    // system is fully usable
-//     wxBATTERY_LOW_STATE,       // start to worry
-//     wxBATTERY_CRITICAL_STATE,  // save quickly
-//     wxBATTERY_SHUTDOWN_STATE,  // too late
-//     wxBATTERY_UNKNOWN_STATE
-// };
-
-// DocDeclStr(
-//     wxBatteryState , wxGetBatteryState(),
-//     "Returns battery state as one of wx.BATTERY_NORMAL_STATE,
-// wx.BATTERY_LOW_STATE}, wx.BATTERY_CRITICAL_STATE,
-// wx.BATTERY_SHUTDOWN_STATE or wx.BATTERY_UNKNOWN_STATE.
-// wx.BATTERY_UNKNOWN_STATE is also the default on platforms where this
-// feature is not implemented.", "");
-
-
-
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------