implement wxLIST_AUTOSIZE support in wxMac's wxListCtrl

[wxWidgets.git] / include / wx / mac / carbon / icon.h

diff --git a/include/wx/mac/carbon/icon.h b/include/wx/mac/carbon/icon.h
index ead16ba56bea2799a7d6d5e8c8e7c7d1da5c2d0f..754a5344c14334a5eba83a854eee4390248af294 100644 (file)
--- a/include/wx/mac/carbon/icon.h
+++ b/include/wx/mac/carbon/icon.h
@@ -15,13 +15,12 @@
 #include "wx/bitmap.h"
 
 // Icon
 #include "wx/bitmap.h"
 
 // Icon

-class WXDLLEXPORT wxIcon : public wxGDIObject
+class WXDLLIMPEXP_CORE wxIcon : public wxGDIObject

 {
 public:
     wxIcon();
 
 {
 public:
     wxIcon();
 

-    wxIcon(const char **data);
-    wxIcon(char **data);
+    wxIcon(const char* const* 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);
     wxIcon(const char bits[], int width , int height );
     wxIcon(const wxString& name, int flags = wxBITMAP_TYPE_ICON_RESOURCE,
          int desiredWidth = -1, int desiredHeight = -1);


@@ -64,7 +63,7 @@ private:
 };
 
 /*
 };
 
 /*

-class WXDLLEXPORT wxICONFileHandler: public wxBitmapHandler
+class WXDLLIMPEXP_CORE wxICONFileHandler: public wxBitmapHandler

 {
   DECLARE_DYNAMIC_CLASS(wxICONFileHandler)
 public:
 {
   DECLARE_DYNAMIC_CLASS(wxICONFileHandler)
 public:


@@ -80,7 +79,7 @@ public:
 };
 */
 
 };
 */
 

-class WXDLLEXPORT wxICONResourceHandler: public wxBitmapHandler
+class WXDLLIMPEXP_CORE wxICONResourceHandler: public wxBitmapHandler

 {
   DECLARE_DYNAMIC_CLASS(wxICONResourceHandler)
 public:
 {
   DECLARE_DYNAMIC_CLASS(wxICONResourceHandler)
 public: