X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2e64141685959602737941d25da7fa9c6254bb4..df5f8f4e3ded997ff338630c0371a689b7717b3d:/wxPython/src/_display.i?ds=sidebyside

diff --git a/wxPython/src/_display.i b/wxPython/src/_display.i
index 259d1a92cd..6cbc1cda98 100644
--- a/wxPython/src/_display.i
+++ b/wxPython/src/_display.i
@@ -61,8 +61,8 @@ means unspecified/known", "");
 
     %pythoncode { def __nonzero__(self): return self.IsOk() }
     %extend {
-        bool __eq__(const wxVideoMode* other) { return other ? (*self == *other) : False; }
-        bool __ne__(const wxVideoMode* other) { return other ? (*self != *other) : True;  }
+        bool __eq__(const wxVideoMode* other) { return other ? (*self == *other) : false; }
+        bool __ne__(const wxVideoMode* other) { return other ? (*self != *other) : true;  }
     }
 
     
@@ -91,7 +91,7 @@ const wxVideoMode     wxDefaultVideoMode;
 #include <wx/dynarray.h>
 #include <wx/vidmode.h>
 
-WX_DECLARE_OBJARRAY(wxVideoMode, wxArrayVideoModes);
+    WX_DECLARE_OBJARRAY(wxVideoMode, wxArrayVideoModes);
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxArrayVideoModes);
 const wxVideoMode wxDefaultVideoMode;
@@ -159,14 +159,8 @@ doesn't belong to any display", "");
     DocStr(GetFromWindow,
            "Find the display where the given window lies, return wx.NOT_FOUND if
 it is not shown at all.", "");
-#ifdef __WXMSW__
     static int GetFromWindow(wxWindow *window);
-#else
-    %extend {
-        static int GetFromWindow(wxWindow *window) 
-            { wxPyRaiseNotImplemented(); return wxNOT_FOUND; }
-    }
-#endif
+
     
     DocDeclStr(
         virtual bool , IsOk() const,
@@ -206,7 +200,7 @@ function is not supported at all on this platform.", "");
         PyObject* GetModes(const wxVideoMode& mode = wxDefaultVideoMode) {
             PyObject* pyList = NULL;
             wxArrayVideoModes arr = self->GetModes(mode);
-            bool blocked = wxPyBeginBlockThreads();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
             pyList = PyList_New(0);
             for (int i=0; i < arr.GetCount(); i++) {
                 wxVideoMode* m = new wxVideoMode(arr.Item(i));
@@ -227,7 +221,22 @@ function is not supported at all on this platform.", "");
 
     DocDeclStr(
         virtual bool , ChangeMode(const wxVideoMode& mode = wxDefaultVideoMode),
-        "Change current mode, return true if succeeded, false otherwise", "");
+        "Changes the video mode of this display to the mode specified in the
+mode parameter.
+
+If wx.DefaultVideoMode is passed in as the mode parameter, the defined
+behaviour is that wx.Display will reset the video mode to the default
+mode used by the display.  On Windows, the behavior is normal.
+However, there are differences on other platforms. On Unix variations
+using X11 extensions it should behave as defined, but some
+irregularities may occur.
+
+On wxMac passing in wx.DefaultVideoMode as the mode parameter does
+nothing.  This happens because Carbon no longer has access to
+DMUseScreenPrefs, an undocumented function that changed the video mode
+to the system default by using the system's 'scrn' resource.
+
+Returns True if succeeded, False otherwise", "");
     
 
     DocDeclStr(