add wxRenderer::GetCheckBoxSize(); refactor wxGTK code to avoid duplication (#9642)

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

diff --git a/include/wx/cocoa/icon.h b/include/wx/cocoa/icon.h
index 8e4214f31d604a9b3921ce233e7989749f05a3de..f054181a9a13b63480fd0ce19dfc21cbdbd9176b 100644 (file)
--- a/include/wx/cocoa/icon.h
+++ b/include/wx/cocoa/icon.h
@@ -18,14 +18,12 @@
 // ========================================================================
 // wxIcon
 // ========================================================================
-class WXDLLEXPORT wxIcon: public wxGDIObject
+class WXDLLIMPEXP_CORE wxIcon : public wxGDIObject
 {
-    DECLARE_DYNAMIC_CLASS(wxIcon)
 public:
     wxIcon();
 
-    wxIcon(const char **data) { CreateFromXpm(data); }
-    wxIcon(char **data) { CreateFromXpm((const char**)data); }
+    wxIcon(const char* const* data) { CreateFromXpm(data); }
     wxIcon(const char bits[], int width , int height );
     wxIcon(const wxString& name, int flags = wxBITMAP_TYPE_ICON_RESOURCE,
         int desiredWidth = -1, int desiredHeight = -1);
@@ -49,14 +47,18 @@ public:
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
 
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const;
     int GetWidth() const;
     int GetHeight() const;
 
     WX_NSImage GetNSImage() const;
-    bool CreateFromXpm(const char **bits);
+    bool CreateFromXpm(const char* const* bits);
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxIcon)
 };
 
-#endif
-    // _WX_COCOA_ICON_H__
+#endif // _WX_COCOA_ICON_H__