fixed wxString iterators linked list corruption

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

diff --git a/wxPython/src/_display.i b/wxPython/src/_display.i
index 6277cad3f58db4278bc2817a16a27b7acfa9bb12..2a8a450458ea4e4fb609eb529cae3b752dc9c840 100644 (file)
--- a/wxPython/src/_display.i
+++ b/wxPython/src/_display.i
@@ -17,6 +17,7 @@
 
 %{
 #include <wx/display.h>
 
 %{
 #include <wx/display.h>

+#include <wx/vidmode.h>

 %}
 
 
 %}
 
 


@@ -72,6 +73,10 @@ means unspecified/known", "");
 
     // refresh frequency in Hz, 0 means unspecified/unknown
     int refresh;
 
     // refresh frequency in Hz, 0 means unspecified/unknown
     int refresh;

+
+    %property(Depth, GetDepth, doc="See `GetDepth`");
+    %property(Height, GetHeight, doc="See `GetHeight`");
+    %property(Width, GetWidth, doc="See `GetWidth`");

 };
 
 
 };
 
 


@@ -96,7 +101,7 @@ class wxDisplay
 {
 public:
     DocCtorStr(
 {
 public:
     DocCtorStr(

-        wxDisplay(size_t index = 0),
+        wxDisplay(unsigned index = 0),

         "Set up a Display instance with the specified display.  The displays
 are numbered from 0 to GetCount() - 1, 0 is always the primary display
 and the only one which is always supported", "");
         "Set up a Display instance with the specified display.  The displays
 are numbered from 0 to GetCount() - 1, 0 is always the primary display
 and the only one which is always supported", "");


@@ -104,7 +109,7 @@ and the only one which is always supported", "");
     ~wxDisplay();
 
     DocDeclStr(
     ~wxDisplay();
 
     DocDeclStr(

-        static size_t , GetCount(),
+        static unsigned , GetCount(),

         "Return the number of available displays.", "");
 
     DocDeclStr(
         "Return the number of available displays.", "");
 
     DocDeclStr(


@@ -116,7 +121,7 @@ doesn't belong to any display", "");
            "Find the display where the given window lies, return wx.NOT_FOUND if
 it is not shown at all.", "");
 
            "Find the display where the given window lies, return wx.NOT_FOUND if
 it is not shown at all.", "");
 

-    static int GetFromWindow(wxWindow *window);
+    static int GetFromWindow(const wxWindow *window);

 
 
     DocDeclStr(
 
 
     DocDeclStr(


@@ -234,6 +239,13 @@ Returns True if succeeded, False otherwise", "");
         }
 
     } // end of %extend
         }
 
     } // end of %extend

+
+    %property(ClientArea, GetClientArea, doc="See `GetClientArea`");
+    %property(CurrentMode, GetCurrentMode, doc="See `GetCurrentMode`");
+    %property(Geometry, GetGeometry, doc="See `GetGeometry`");
+    %property(Modes, GetModes, doc="See `GetModes`");
+    %property(Name, GetName, doc="See `GetName`");
+    

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------