fixed wxGTK1 compilation after wxDC changes (still doesn't work)

[wxWidgets.git] / include / wx / iconbndl.h

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index e96b1995472aac7e46f840a67581c330e6131d68..1892c30a1c289e923b484e858002b17c297dfe81 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -18,10 +18,10 @@
 #include "wx/gdicmn.h"
 #include "wx/icon.h"
 
 #include "wx/gdicmn.h"
 #include "wx/icon.h"
 

-class WXDLLIMPEXP_CORE wxIcon;
-class WXDLLIMPEXP_BASE wxString;
+class WXDLLIMPEXP_FWD_CORE wxIcon;
+class WXDLLIMPEXP_FWD_BASE wxString;

 
 

-class WXDLLEXPORT wxIconBundle;
+class WXDLLIMPEXP_FWD_CORE wxIconBundle;

 
 WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
 
 
 WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
 


@@ -46,8 +46,6 @@ public:
     wxIconBundle& operator=(const wxIconBundle& ic)
         { if ( this != &ic) Ref(ic); return *this; }
 
     wxIconBundle& operator=(const wxIconBundle& ic)
         { if ( this != &ic) Ref(ic); return *this; }
 

-    virtual bool IsOk() const;
-

 
     // adds all the icons contained in the file to the collection,
     // if the collection already contains icons with the same
 
     // adds all the icons contained in the file to the collection,
     // if the collection already contains icons with the same


@@ -87,8 +85,8 @@ public:
     bool IsEmpty() const { return GetIconCount() == 0; }
 
 protected:
     bool IsEmpty() const { return GetIconCount() == 0; }
 
 protected:

-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

 
 private:
     // delete all icons
 
 private:
     // delete all icons