Detect Apple bug that prevents the joystick code compiling for OS X 10.1

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

diff --git a/wxPython/src/_icon.i b/wxPython/src/_icon.i
index 2fcaadd9e07c71894230ec86e7882328d4dfd0aa..d117a99ff6abbc57c5e1cc58b476129978e9b309 100644 (file)
--- a/wxPython/src/_icon.i
+++ b/wxPython/src/_icon.i
@@ -20,23 +20,27 @@
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 
 

+MustHaveApp(wxIcon);
+

 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();
 
     // alternate constructors
            int desiredWidth = -1, int desiredHeight = -1);
     ~wxIcon();
 
     // alternate constructors

-    %name(EmptyIcon) wxIcon();
-    %name(IconFromLocation) wxIcon(const wxIconLocation& loc);
+    %RenameCtor(EmptyIcon, wxIcon());
+    %RenameCtor(IconFromLocation,  wxIcon(const wxIconLocation& loc));

     %extend {
     %extend {

-        %name(IconFromBitmap) wxIcon(const wxBitmap& bmp) {
+        %RenameCtor(IconFromBitmap, wxIcon(const wxBitmap& bmp))
+        {

             wxIcon* icon = new wxIcon();
             icon->CopyFromBitmap(bmp);
             return icon;
         }
             wxIcon* icon = new wxIcon();
             icon->CopyFromBitmap(bmp);
             return icon;
         }

-        %name(IconFromXPMData) wxIcon(PyObject* listOfStrings) {
+        %RenameCtor(IconFromXPMData, wxIcon(PyObject* listOfStrings))
+        {

             char**  cArray = NULL;
             wxIcon* icon;
 
             char**  cArray = NULL;
             wxIcon* icon;
 


@@ -51,13 +55,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();


@@ -132,10 +138,10 @@ public:
     wxIconBundle();
 
     // initializes the bundle with the icon(s) found in the file
     wxIconBundle();
 
     // initializes the bundle with the icon(s) found in the file

-    %name(IconBundleFromFile) wxIconBundle( const wxString& file, long type );
+    %RenameCtor(IconBundleFromFile, wxIconBundle( const wxString& file, long type ));

 
     // initializes the bundle with a single icon
 
     // initializes the bundle with a single icon

-    %name(IconBundleFromIcon)wxIconBundle( const wxIcon& icon );
+    %RenameCtor(IconBundleFromIcon, wxIconBundle( const wxIcon& icon ));

 
     ~wxIconBundle();
 
 
     ~wxIconBundle();
 


@@ -147,7 +153,7 @@ public:
     // adds all the icons contained in the file to the collection,
     // if the collection already contains icons with the same
     // width and height, they are replaced
     // adds all the icons contained in the file to the collection,
     // if the collection already contains icons with the same
     // width and height, they are replaced

-    %name(AddIconFromFile)void AddIcon( const wxString& file, long type );
+    %Rename(AddIconFromFile,void, AddIcon( const wxString& file, long type ));

 
     // returns the icon with the given size; if no such icon exists,
     // returns the icon with size wxSYS_ICON_[XY]; if no such icon exists,
 
     // returns the icon with the given size; if no such icon exists,
     // returns the icon with size wxSYS_ICON_[XY]; if no such icon exists,