Script tweaks

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

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index 101671a656860397cfa28d0d10d1b76b0f068578..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_
 
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "icon.h"
 #endif
 
     #pragma interface "icon.h"
 #endif
 


@@ -20,23 +20,7 @@
 // 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 +28,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 WXDLLEXPORT wxIconRefData : public wxGDIImageRefData

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


@@ -57,7 +41,7 @@ public:
 // Icon
 // ---------------------------------------------------------------------------
 
 // Icon
 // ---------------------------------------------------------------------------
 

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

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


@@ -65,18 +49,23 @@ public:
     wxIcon() { }
 
         // copy
     wxIcon() { }
 
         // copy

-    wxIcon(const wxIcon& icon) { Ref(icon); }
+    wxIcon(const wxIcon& icon) : wxGDIImage(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
     wxIcon(const char **data) { CreateIconFromXpm(data); }
         // from XPM data
     wxIcon(const char **data) { CreateIconFromXpm(data); }

+

     wxIcon(char **data) { CreateIconFromXpm((const char **)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);
 
         // 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,
     virtual ~wxIcon();
 
     virtual bool LoadFile(const wxString& name,


@@ -90,23 +79,28 @@ public:
     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; }
 
     void SetHICON(WXHICON icon) { SetHandle((WXHANDLE)icon); }
     WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
 
     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;
     }
 
 protected:
     virtual wxGDIImageRefData *CreateData() const
     {
         return new wxIconRefData;
     }
 

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

     // create from XPM data
     void CreateIconFromXpm(const char **data);
 
     // create from XPM data
     void CreateIconFromXpm(const char **data);
 

-    // create from bitmap (which should have a mask unless it's monochrome)
-    void CopyFromBitmap(const wxBitmap& bmp);
-

 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)
 };