preparation work for implementing images support in wxButton: move wxBitmapButton...

[wxWidgets.git] / include / wx / generic / icon.h

diff --git a/include/wx/generic/icon.h b/include/wx/generic/icon.h
index 6d216d56a5c7a46c62d08a98f26a25ceb711aa1f..3a1f5072acd160792bd4029dee145fa42bf1cbf9 100644 (file)
--- a/include/wx/generic/icon.h
+++ b/include/wx/generic/icon.h
@@ -42,9 +42,14 @@ public:
     {
     }
 
     {
     }
 

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

 
     // create from bitmap (which should have a mask unless it's monochrome):
     // there shouldn't be any implicit bitmap -> icon conversion (i.e. no
 
     // create from bitmap (which should have a mask unless it's monochrome):
     // there shouldn't be any implicit bitmap -> icon conversion (i.e. no