Added wx.GetColourFromUser and wx.GetFontFromUser

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

diff --git a/wxPython/src/_functions.i b/wxPython/src/_functions.i
index 22e904c248b20bc45fc0edb1e7ce4dd0b7e471a4..e39ac0b9c04375dd7c702a8639e30692717e0c2b 100644 (file)
--- a/wxPython/src/_functions.i
+++ b/wxPython/src/_functions.i
@@ -78,10 +78,10 @@ wxString wxGetOsDescription();
 // int wxParseCommonDialogsFilter(const wxString& wildCard, wxArrayString& descriptions, wxArrayString& filters);
 
 #if defined(__WXMSW__) || defined(__WXMAC__)
 // int wxParseCommonDialogsFilter(const wxString& wildCard, wxArrayString& descriptions, wxArrayString& filters);
 
 #if defined(__WXMSW__) || defined(__WXMAC__)

-long wxGetFreeMemory();
+wxMemorySize wxGetFreeMemory();

 #else
 %inline %{
 #else
 %inline %{

-    long wxGetFreeMemory()
+    wxMemorySize wxGetFreeMemory()

         { wxPyRaiseNotImplemented(); return 0; }
 %}
 #endif
         { wxPyRaiseNotImplemented(); return 0; }
 %}
 #endif


@@ -205,6 +205,7 @@ int wxMessageBox(const wxString& message,
                  int x = -1, int y = -1);
 
 // WXWIN_COMPATIBILITY_2_4
                  int x = -1, int y = -1);
 
 // WXWIN_COMPATIBILITY_2_4

+#if 0

 MustHaveApp(wxGetNumberFromUser);
 long wxGetNumberFromUser(const wxString& message,
                          const wxString& prompt,
 MustHaveApp(wxGetNumberFromUser);
 long wxGetNumberFromUser(const wxString& message,
                          const wxString& prompt,


@@ -213,6 +214,8 @@ long wxGetNumberFromUser(const wxString& message,
                          long min = 0, long max = 100,
                          wxWindow *parent = NULL,
                          const wxPoint& pos = wxDefaultPosition);
                          long min = 0, long max = 100,
                          wxWindow *parent = NULL,
                          const wxPoint& pos = wxDefaultPosition);

+%pythoncode { GetNumberFromUser = wx._deprecated(GetNumberFromUser) }
+#endif

 
 // GDI Functions
 
 
 // GDI Functions
 


@@ -254,6 +257,21 @@ MustHaveApp(wxSetCursor);
 void wxSetCursor(wxCursor& cursor);
 
 
 void wxSetCursor(wxCursor& cursor);
 
 

+MustHaveApp(wxGetXDisplay);
+DocStr(wxGetXDisplay,
+"Returns a swigified pointer to the X11 display.  Returns None on
+other platforms.", "");
+%inline %{
+    void* wxGetXDisplay()
+    {
+#ifdef __WXGTK__
+        return wxGetDisplay();
+#else
+        return NULL;
+#endif
+    }
+%}
+

 
 // Miscellaneous functions
 
 
 // Miscellaneous functions