log wxChoice events in the same format as wxComboBox ones to make it simpler to compa...

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

diff --git a/wxPython/src/_display.i b/wxPython/src/_display.i
index 938c85ada3fbad0e6a6e6eb5f134a9fa25fd0931..6cbc1cda989a8bef3e68c4b9aba09bcfe8280817 100644 (file)
--- a/wxPython/src/_display.i
+++ b/wxPython/src/_display.i
@@ -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));