reSWIGged

[wxWidgets.git] / wxPython / src / _functions.i

diff --git a/wxPython/src/_functions.i b/wxPython/src/_functions.i
index 7375b3c107f2c08fdb6eff71293230dfbd55de6b..44f8c045d7450d9a70805033fa65e6fe56e11e98 100644 (file)
--- a/wxPython/src/_functions.i
+++ b/wxPython/src/_functions.i
@@ -59,6 +59,47 @@ 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)");
@@ -73,6 +114,15 @@ wxString wxGetOsDescription();
 // // "All files (*)|*|Image Files (*.jpeg *.png)|*.jpg;*.png"
 // int wxParseCommonDialogsFilter(const wxString& wildCard, wxArrayString& descriptions, wxArrayString& filters);
 
+
+%typemap(out) wxMemorySize {
+    %#if wxUSE_LONGLONG
+         $result = PyLong_FromLongLong($1.GetValue());
+    %#else
+         $result = PyInt_FromLong($1);
+    %#endif
+}
+
 #if defined(__WXMSW__) || defined(__WXMAC__)
 wxMemorySize wxGetFreeMemory();
 #else
@@ -200,8 +250,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,
@@ -210,8 +258,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