Revert reentrancy patch (#1573619)

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

diff --git a/wxPython/src/_display.i b/wxPython/src/_display.i
index fb8433d933db27b4e1c06e6b603ce63862e02cd9..1003365dfc0d8403c117d84d74a546c423fea569 100644 (file)
--- a/wxPython/src/_display.i
+++ b/wxPython/src/_display.i
@@ -17,6 +17,7 @@
 
 %{
 #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;
+
+    %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(
-        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", "");
@@ -104,7 +109,7 @@ and the only one which is always supported", "");
     ~wxDisplay();
 
     DocDeclStr(
-        static size_t , GetCount(),
+        static unsigned , GetCount(),
         "Return the number of available displays.", "");
 
     DocDeclStr(