make wxMouseState accessors const; document this class

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

diff --git a/include/wx/iconbndl.h b/include/wx/iconbndl.h
index d7e037b23ba20bbb0067815a85ceb93b88924c11..c52c984d8a63cf4e4386c7a457e31eb94e8a9d06 100644 (file)
--- a/include/wx/iconbndl.h
+++ b/include/wx/iconbndl.h
@@ -28,7 +28,7 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxIcon, wxIconArray);
 // this class can't load bitmaps of type wxBITMAP_TYPE_ICO_RESOURCE,
 // if you need them, you have to load them manually and call
 // wxIconCollection::AddIcon
-class WXDLLEXPORT wxIconBundle : public wxGDIObject
+class WXDLLIMPEXP_CORE wxIconBundle : public wxGDIObject
 {
 public:
     // default constructor
@@ -46,8 +46,6 @@ public:
     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
@@ -87,8 +85,8 @@ public:
     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