Patches from KevinO that work around issues where the widget isn't

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

diff --git a/wxPython/src/_icon.i b/wxPython/src/_icon.i
index 2fcaadd9e07c71894230ec86e7882328d4dfd0aa..6a69d79f411992d19c96a542a1149b8b9e7d11b2 100644 (file)
--- a/wxPython/src/_icon.i
+++ b/wxPython/src/_icon.i
@@ -23,7 +23,7 @@
 class wxIcon : public wxGDIObject
 {
 public:
 class wxIcon : public wxGDIObject
 {
 public:

-    wxIcon(const wxString& name, long flags,
+    wxIcon(const wxString& name, wxBitmapType type,

            int desiredWidth = -1, int desiredHeight = -1);
     ~wxIcon();
 
            int desiredWidth = -1, int desiredHeight = -1);
     ~wxIcon();
 


@@ -51,13 +51,15 @@ public:
 
     
 #ifndef __WXMAC__
 
     
 #ifndef __WXMAC__

-    bool LoadFile(const wxString& name, long flags);
+    bool LoadFile(const wxString& name, wxBitmapType type);

 #endif
 
     // wxGDIImage methods
 #ifdef __WXMSW__
     long GetHandle();
 #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();
 #endif
     bool Ok();
     int GetWidth();