update from herbert breunung

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

diff --git a/wxPython/src/_icon.i b/wxPython/src/_icon.i
index bd112d3d98cec215172168b53ed1e917ffbe092d..f43e09910bfe4636800405b50c94ef606ecdde25 100644 (file)
--- a/wxPython/src/_icon.i
+++ b/wxPython/src/_icon.i
@@ -20,10 +20,12 @@
 //---------------------------------------------------------------------------
 
 
+MustHaveApp(wxIcon);
+
 class wxIcon : public wxGDIObject
 {
 public:
-    wxIcon(const wxString& name, long flags,
+    wxIcon(const wxString& name, wxBitmapType type,
            int desiredWidth = -1, int desiredHeight = -1);
     ~wxIcon();
 
@@ -51,13 +53,15 @@ public:
 
     
 #ifndef __WXMAC__
-    bool LoadFile(const wxString& name, long flags);
+    bool LoadFile(const wxString& name, wxBitmapType type);
 #endif
 
     // wxGDIImage methods
 #ifdef __WXMSW__
     long GetHandle();
-    void SetHandle(long handle);
+    %extend {
+        void SetHandle(long handle) { self->SetHandle((WXHANDLE)handle); }
+    }
 #endif
     bool Ok();
     int GetWidth();
@@ -93,7 +97,7 @@ public:
     ~wxIconLocation();
 
 
-    // returns true if this object is valid/initialized
+    // returns True if this object is valid/initialized
     bool IsOk() const;
     %pythoncode { def __nonzero__(self): return self.Ok() }