Fixed toolbar bitmap bug introduced by deriving wxToolMenuBar

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

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index 6104c696eccb2f1166ad122aed6e57bc84d3bec9..f7e3f41ad1a97820e4917d83eaa9d6894166dbdd 100644 (file)
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -12,7 +12,7 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "icon.h"
 #endif
 
@@ -20,23 +20,7 @@
 // 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
@@ -44,7 +28,7 @@
 
 // notice that although wxIconRefData inherits from wxBitmapRefData, it is not
 // a valid wxBitmapRefData
-class WXDLLEXPORT wxIconRefData : public wxIconRefDataBase
+class WXDLLEXPORT wxIconRefData : public wxGDIImageRefData
 {
 public:
     wxIconRefData() { }
@@ -57,18 +41,31 @@ public:
 // Icon
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxIcon : public wxIconBase
+class WXDLLEXPORT wxIcon : public wxGDIImage
 {
 public:
-    wxIcon();
+    // ctors
+        // default
+    wxIcon() { }
 
-    // Copy constructors
-    wxIcon(const wxIcon& icon) { Ref(icon); }
+        // copy
+    wxIcon(const wxIcon& icon) : wxGDIImage(icon) { Ref(icon); }
 
+        // from raw 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); }
+
+        // from resource/file
     wxIcon(const wxString& name,
            long type = wxBITMAP_TYPE_ICO_RESOURCE,
            int desiredWidth = -1, int desiredHeight = -1);
+
+    wxIcon(const wxIconLocation& loc);
+
     virtual ~wxIcon();
 
     virtual bool LoadFile(const wxString& name,
@@ -82,17 +79,28 @@ public:
     bool operator != (const wxIcon& icon) const
         { return m_refData != icon.m_refData; }
 
+    // implementation only from now on
     wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
 
     void SetHICON(WXHICON icon) { SetHandle((WXHANDLE)icon); }
     WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
 
+    // create from bitmap (which should have a mask unless it's monochrome):
+    // there shouldn't be any implicit bitmap -> icon conversion (i.e. no
+    // ctors, assignment operators...), but it's ok to have such function
+    void CopyFromBitmap(const wxBitmap& bmp);
+
 protected:
     virtual wxGDIImageRefData *CreateData() const
     {
         return new wxIconRefData;
     }
 
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+
+    // create from XPM data
+    void CreateIconFromXpm(const char **data);
+
 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)
 };