wx.GetXDisplay

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/__misc_rename.i b/wxPython/src/__misc_rename.i
index 260e96321148625a0539ff249eb3029b52228e96..039e7ec5815b8f38232392c8627780bd014d57da 100644 (file)
--- a/wxPython/src/__misc_rename.i
+++ b/wxPython/src/__misc_rename.i
@@ -150,6 +150,7 @@
 %rename(ClientDisplayRect)                  wxClientDisplayRect;
 %rename(GetClientDisplayRect)               wxGetClientDisplayRect;
 %rename(SetCursor)                          wxSetCursor;
+%rename(GetXDisplay)                        wxGetXDisplay;
 %rename(BeginBusyCursor)                    wxBeginBusyCursor;
 %rename(GetActiveWindow)                    wxGetActiveWindow;
 %rename(GenericFindWindowAtPoint)           wxGenericFindWindowAtPoint;

diff --git a/wxPython/src/_functions.i b/wxPython/src/_functions.i
index 22e904c248b20bc45fc0edb1e7ce4dd0b7e471a4..23b2cb1cb59959b1600a36d342034b1835e59688 100644 (file)
--- a/wxPython/src/_functions.i
+++ b/wxPython/src/_functions.i
@@ -254,6 +254,21 @@ MustHaveApp(wxSetCursor);
 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