bitwise vs. logical operator

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

diff --git a/wxPython/src/_cursor.i b/wxPython/src/_cursor.i
index f1fd9f30362d9c3350fc3068ea2f9453f35882bd..02e8a7f1cccfafbb476061510f2fef4b91572810 100644 (file)
--- a/wxPython/src/_cursor.i
+++ b/wxPython/src/_cursor.i
@@ -72,12 +72,12 @@ 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);

-            img.SetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X, hotSpotX);
-            img.SetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y, hotSpotY);
+            img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, hotSpotX);
+            img.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, hotSpotY);

             return new wxCursor(img);
 %#else
             return new wxCursor(cursorName, type, hotSpotX, hotSpotY);
             return new wxCursor(img);
 %#else
             return new wxCursor(cursorName, type, hotSpotX, hotSpotY);


@@ -96,19 +96,14 @@ stock cursors are available on all platforms.", "",
     
     DocCtorStrName(
         wxCursor(const wxImage& image),
     
     DocCtorStrName(
         wxCursor(const wxImage& image),

-        "Constructs a cursor from a wxImage. The cursor is monochrome, colors
-with the RGB elements all greater than 127 will be foreground, colors
-less than this background. The mask (if any) will be used as
-transparent.",
+        "Constructs a cursor from a `wx.Image`. The mask (if any) will be used
+for setting the transparent portions of the cursor.",

 "
 "

-In MSW the foreground will be white and the background
-black. The cursor is resized to 32x32.
+In MSW the cursor is resized to 32x32 if it was larger.

 
 

-In GTK, the two most frequent colors will be used for foreground and
-background. 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 and currently only shown as
-black/white (mask respected).",
+On MacOS the cursor is resized to 16x16 if it was larger.",

         CursorFromImage);
     
     
         CursorFromImage);
     
     


@@ -145,10 +140,11 @@ black/white (mask respected).",
 #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__