suspend logging while in wx.DataFormat.GetId

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

diff --git a/wxPython/src/_icon.i b/wxPython/src/_icon.i
index 2f91e9371b0b6aca1421e76c7e3fd51bda8bc980..0e3ff73d7a9c75abc9a14ea981fd59ea613a2582 100644 (file)
--- a/wxPython/src/_icon.i
+++ b/wxPython/src/_icon.i
@@ -65,7 +65,8 @@ public:
         void SetHandle(long handle) { self->SetHandle((WXHANDLE)handle); }
     }
 #endif
-    bool Ok();
+    bool IsOk();
+    %pythoncode { Ok = IsOk }
     int GetWidth();
     int GetHeight();
     int GetDepth();
@@ -77,7 +78,7 @@ public:
 #endif
     void CopyFromBitmap(const wxBitmap& bmp);
 
-    %pythoncode { def __nonzero__(self): return self.Ok() }
+    %pythoncode { def __nonzero__(self): return self.IsOk() }
     
     %property(Depth, GetDepth, SetDepth, doc="See `GetDepth` and `SetDepth`");
     %property(Height, GetHeight, SetHeight, doc="See `GetHeight` and `SetHeight`");
@@ -106,7 +107,7 @@ public:
 
     // returns True if this object is valid/initialized
     bool IsOk() const;
-    %pythoncode { def __nonzero__(self): return self.Ok() }
+    %pythoncode { def __nonzero__(self): return self.IsOk() }
 
     // set/get the icon file name
     void SetFileName(const wxString& filename);