Don't use hidden items for size calc (patch 1698314)

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

diff --git a/wxPython/src/_cursor.i b/wxPython/src/_cursor.i
index bcdda58f5457515d603043a59d976df8d1361aef..02e8a7f1cccfafbb476061510f2fef4b91572810 100644 (file)
--- a/wxPython/src/_cursor.i
+++ b/wxPython/src/_cursor.i
@@ -72,7 +72,7 @@ public:
                "Construct a Cursor from a file.  Specify the type of file using
 wx.BITAMP_TYPE* constants, and specify the hotspot if not using a .cur
 file.","
                "Construct a Cursor from a file.  Specify the type of file using
 wx.BITAMP_TYPE* constants, and specify the hotspot if not using a .cur
 file.","

-:see: Alternate constructors `wx.StockCursor`,`wx.CursorFromImage`, `wx.CursorFromBits`");
+:see: Alternate constructors `wx.StockCursor`,`wx.CursorFromImage`");

         wxCursor(const wxString& cursorName, long type, int hotSpotX=0, int hotSpotY=0) {
 %#ifdef __WXGTK__
             wxImage img(cursorName, type);
         wxCursor(const wxString& cursorName, long type, int hotSpotX=0, int hotSpotY=0) {
 %#ifdef __WXGTK__
             wxImage img(cursorName, type);


@@ -97,13 +97,13 @@ stock cursors are available on all platforms.", "",
     DocCtorStrName(
         wxCursor(const wxImage& image),
         "Constructs a cursor from a `wx.Image`. The mask (if any) will be used
     DocCtorStrName(
         wxCursor(const wxImage& image),
         "Constructs a cursor from a `wx.Image`. The mask (if any) will be used

-as transparent.",
+for setting the transparent portions of the cursor.",

 "
 "

-In MSW the cursor is resized to 32x32.
+In MSW the cursor is resized to 32x32 if it was larger.

 
 In GTK the cursor will be displayed at the size of the image.
 
 
 In GTK the cursor will be displayed at the size of the image.
 

-On MacOS the cursor is resized to 16x16.",
+On MacOS the cursor is resized to 16x16 if it was larger.",

         CursorFromImage);
     
     
         CursorFromImage);
     
     


@@ -140,10 +140,11 @@ On MacOS the cursor is resized to 16x16.",
 #endif
     
     DocDeclStr(
 #endif
     
     DocDeclStr(

-        bool , Ok(),
+        bool , IsOk(),

         "", "");
         "", "");

+    %pythoncode { Ok = IsOk }

 
 

-    %pythoncode { def __nonzero__(self): return self.Ok() }
+    %pythoncode { def __nonzero__(self): return self.IsOk() }

 
     
 #ifdef __WXMSW__
 
     
 #ifdef __WXMSW__