fix build errors deriving from making wxColourData members private

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

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index c4b420937ce05f4a4418404eaa3e3b38e8f62369..36ec8479e5f03a346ef71bec2cdcfef804954b42 100644 (file)
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -24,7 +24,7 @@
 
 // notice that although wxIconRefData inherits from wxBitmapRefData, it is not
 // a valid wxBitmapRefData
 
 // notice that although wxIconRefData inherits from wxBitmapRefData, it is not
 // a valid wxBitmapRefData

-class WXDLLEXPORT wxIconRefData : public wxGDIImageRefData
+class WXDLLIMPEXP_CORE wxIconRefData : public wxGDIImageRefData

 {
 public:
     wxIconRefData() { }
 {
 public:
     wxIconRefData() { }


@@ -37,7 +37,7 @@ public:
 // Icon
 // ---------------------------------------------------------------------------
 
 // Icon
 // ---------------------------------------------------------------------------
 

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

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -48,13 +48,13 @@ public:
     wxIcon(const char bits[], int width, int height);
 
         // from XPM data
     wxIcon(const char bits[], int width, int height);
 
         // from XPM data

-    wxIcon(const char **data) { CreateIconFromXpm(data); }
-
-    wxIcon(char **data) { CreateIconFromXpm((const char **)data); }
-
+    wxIcon(const char* const* data) { CreateIconFromXpm(data); }
+#ifdef wxNEEDS_CHARPP
+    wxIcon(char **data) { CreateIconFromXpm(wx_const_cast(const char* const*, data)); }
+#endif

         // from resource/file
     wxIcon(const wxString& name,
         // from resource/file
     wxIcon(const wxString& name,

-           long type = wxBITMAP_TYPE_ICO_RESOURCE,
+           wxBitmapType type = wxICON_DEFAULT_TYPE,

            int desiredWidth = -1, int desiredHeight = -1);
 
     wxIcon(const wxIconLocation& loc);
            int desiredWidth = -1, int desiredHeight = -1);
 
     wxIcon(const wxIconLocation& loc);


@@ -62,7 +62,7 @@ public:
     virtual ~wxIcon();
 
     virtual bool LoadFile(const wxString& name,
     virtual ~wxIcon();
 
     virtual bool LoadFile(const wxString& name,

-                          long type = wxBITMAP_TYPE_ICO_RESOURCE,
+                          wxBitmapType type = wxICON_DEFAULT_TYPE,

                           int desiredWidth = -1, int desiredHeight = -1);
 
     // implementation only from now on
                           int desiredWidth = -1, int desiredHeight = -1);
 
     // implementation only from now on


@@ -85,7 +85,7 @@ protected:
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
     // create from XPM data
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
     // create from XPM data

-    void CreateIconFromXpm(const char **data);
+    void CreateIconFromXpm(const char* const* data);

 
 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)