Make wxBitmap inherit from wxBitmapBase

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-05 13:08:44 +00:00
parent 58b907f6e1
commit 4611dd06a1
7 changed files with 37 additions and 20 deletions
--- a/include/wx/gtk/icon.h
+++ b/include/wx/gtk/icon.h
@@ -38,7 +38,7 @@ public:

    // For compatibility with wxMSW where desired size is sometimes required to
    // distinguish between multiple icons in a resource.
-    wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM,
+    wxIcon( const wxString& filename, wxBitmapType type = wxBITMAP_TYPE_XPM,
            int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
        wxBitmap(filename, type)
    {