fix virtual function hiding for LoadFile(); replace a few more longs with wxBitmapTypes

[wxWidgets.git] / include / wx / osx / carbon / icon.h

diff --git a/include/wx/osx/carbon/icon.h b/include/wx/osx/carbon/icon.h
index caa9a17d64e943e4225a9fadfa028c6c5c452ac5..06c269ecae6d1f707bad144f5525d0097d197dcb 100644 (file)
--- a/include/wx/osx/carbon/icon.h
+++ b/include/wx/osx/carbon/icon.h
@@ -22,7 +22,7 @@ public:
 
     wxIcon(const char* const* data);
     wxIcon(const char bits[], int width , int height );
 
     wxIcon(const char* const* data);
     wxIcon(const char bits[], int width , int height );

-    wxIcon(const wxString& name, int flags = wxICON_DEFAULT_TYPE,
+    wxIcon(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE,

            int desiredWidth = -1, int desiredHeight = -1);
     wxIcon(const wxIconLocation& loc)
     {
            int desiredWidth = -1, int desiredHeight = -1);
     wxIcon(const wxIconLocation& loc)
     {


@@ -88,9 +88,16 @@ public:
     SetType(wxBITMAP_TYPE_ICON_RESOURCE);
   };
 
     SetType(wxBITMAP_TYPE_ICON_RESOURCE);
   };
 

-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-      int desiredWidth = -1, int desiredHeight = -1);
-
+  virtual bool LoadFile(wxBitmap *bitmap,
+                        const wxString& name,
+                        wxBitmapType flags,
+                        int desiredWidth = -1,
+                        int desiredHeight = -1);
+  // unhide the base class virtual
+  virtual bool LoadFile(wxBitmap *bitmap,
+                        const wxString& name,
+                        wxBitmapType flags)
+      { return LoadFile(bitmap, name, flags, -1, -1); }

 };
 
 #endif
 };
 
 #endif