Fix wrong return value in the changes of r73365.

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

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index 1d9305e9aa4dc64d61146df08e31dc2275a7aac3..21f8abd6b4af6e3123ed92d4448ec12f600b83a2 100644 (file)
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -12,31 +12,11 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 

-#ifdef __GNUG__
-    #pragma interface "icon.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 

-// compatible (even if incorrect) behaviour by default: derive wxIcon from
-// wxBitmap
-#ifndef wxICON_IS_BITMAP
-    #define wxICON_IS_BITMAP 1
-#endif
-
-#if wxICON_IS_BITMAP
-    #include "wx/bitmap.h"
-
-    #define wxIconRefDataBase   wxBitmapRefData
-    #define wxIconBase          wxBitmap
-#else
-    #include "wx/msw/gdiimage.h"
-
-    #define wxIconRefDataBase   wxGDIImageRefData
-    #define wxIconBase          wxGDIImage
-#endif
+#include "wx/msw/gdiimage.h"

 
 // ---------------------------------------------------------------------------
 // icon data
 
 // ---------------------------------------------------------------------------
 // icon data


@@ -44,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 wxIconRefDataBase
+class WXDLLIMPEXP_CORE wxIconRefData : public wxGDIImageRefData

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


@@ -57,39 +37,34 @@ public:
 // Icon
 // ---------------------------------------------------------------------------
 
 // Icon
 // ---------------------------------------------------------------------------
 

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

 {
 public:
     // ctors
         // default
     wxIcon() { }
 
 {
 public:
     // ctors
         // default
     wxIcon() { }
 

-        // copy
-    wxIcon(const wxIcon& icon) { Ref(icon); }
-

         // from raw data
     wxIcon(const char bits[], int width, int height);
         // from raw data
     wxIcon(const char bits[], int width, int height);

+

         // from XPM data
         // 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(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);
 
            int desiredWidth = -1, int desiredHeight = -1);
 

+    wxIcon(const wxIconLocation& loc);
+

     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);
 
                           int desiredWidth = -1, int desiredHeight = -1);
 

-    wxIcon& operator = (const wxIcon& icon)
-        { if ( *this != icon ) Ref(icon); return *this; }
-    bool operator == (const wxIcon& icon) const
-        { return m_refData == icon.m_refData; }
-    bool operator != (const wxIcon& icon) const
-        { return m_refData != icon.m_refData; }
-

     // implementation only from now on
     wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
 
     // implementation only from now on
     wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
 


@@ -107,8 +82,10 @@ protected:
         return new wxIconRefData;
     }
 
         return new wxIconRefData;
     }
 

+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+

     // create from XPM data
     // 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)