X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb9010ed40454cc978a9cbaa6de2ee41ea8b6c84..4f72fe4f1a906688bfc4ea99a5007437503babdf:/include/wx/os2/icon.h

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index 07a1f4fb55..c6b46a110f 100644
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -12,91 +12,89 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
-#include "wx/bitmap.h"
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// compatible (even if incorrect) behaviour by default: derive wxIcon from
+// wxBitmap
+#ifndef wxICON_IS_BITMAP
+    #define wxICON_IS_BITMAP 1
+#endif
 
-class WXDLLEXPORT wxIconRefData: public wxBitmapRefData
-{
-    friend class WXDLLEXPORT wxBitmap;
-    friend class WXDLLEXPORT wxIcon;
-public:
-    wxIconRefData();
-    ~wxIconRefData();
+#if wxICON_IS_BITMAP
+    #include "wx/bitmap.h"
 
-public:
-    WXHICON m_hIcon;
-};
+    #define wxIconRefDataBase   wxBitmapRefData
+    #define wxIconBase          wxBitmap
+#else
+    #include "wx/os2/gdiimage.h"
 
-#define M_ICONDATA ((wxIconRefData *)m_refData)
-#define M_ICONHANDLERDATA ((wxIconRefData *)bitmap->GetRefData())
+    #define wxIconRefDataBase   wxGDIImageRefData
+    #define wxIconBase          wxGDIImage
+#endif
 
-// Icon
-class WXDLLEXPORT wxIcon: public wxBitmap
+class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
 {
-  DECLARE_DYNAMIC_CLASS(wxIcon)
-
 public:
-  wxIcon();
-
-  // Copy constructors
-  inline wxIcon(const wxIcon& icon) { Ref(icon); }
-
-  wxIcon(const char bits[], int width, int height);
-  wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
-    int desiredWidth = -1, int desiredHeight = -1);
-  ~wxIcon();
-
-  bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
-      int desiredWidth = -1, int desiredHeight = -1);
-
-  inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
-  inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
-  inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
+    wxIconRefData() { };
+    virtual ~wxIconRefData() { Free(); m_hIcon = NULL; }
 
-  void SetHICON(WXHICON ico);
-  inline WXHICON GetHICON() const { return (M_ICONDATA ? M_ICONDATA->m_hIcon : 0); }
-
-  virtual bool Ok() const { return (m_refData != NULL) ; }
-private:
-  // supress virtual function hiding warning
-  virtual bool LoadFile( const wxString& name
-                        ,long type = wxBITMAP_TYPE_BMP_RESOURCE
-                       )
-   { return(wxBitmap::LoadFile(name, type)); };
-};
-
-// Example handlers. TODO: write your own handlers for relevant types.
-
-class WXDLLEXPORT wxICOFileHandler: public wxBitmapHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxICOFileHandler)
+    virtual void Free();
 public:
-  inline wxICOFileHandler()
-  {
-    m_name = "ICO icon file";
-    m_extension = "ico";
-    m_type = wxBITMAP_TYPE_ICO;
-  };
-
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-      int desiredWidth = -1, int desiredHeight = -1);
+    WXHICON m_hIcon;
 };
 
-class WXDLLEXPORT wxICOResourceHandler: public wxBitmapHandler
+// ---------------------------------------------------------------------------
+// Icon
+// ---------------------------------------------------------------------------
+
+class WXDLLEXPORT wxIcon: public wxIconBase
 {
-  DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
 public:
-  inline wxICOResourceHandler()
-  {
-    m_name = "ICO resource";
-    m_extension = "ico";
-    m_type = wxBITMAP_TYPE_ICO_RESOURCE;
-  };
-
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-      int desiredWidth = -1, int desiredHeight = -1);
+    wxIcon();
+
+    // Copy constructors
+    inline wxIcon(const wxIcon& icon) { Ref(icon); }
+
+    wxIcon( const char bits[]
+           ,int        nWidth
+           ,int        nHeight
+          );
+    wxIcon( const wxString& rName
+           ,long            lFlags = wxBITMAP_TYPE_ICO_RESOURCE
+           ,int             nDesiredWidth = -1
+           ,int             nDesiredHeight = -1
+          );
+    ~wxIcon();
+
+    bool LoadFile( const wxString& rName
+                  ,long            lFlags = wxBITMAP_TYPE_ICO_RESOURCE
+                  ,int             nDesiredWidth = -1
+                  ,int             nDesiredHeight = -1
+                 );
+
+    inline wxIcon& operator = (const wxIcon& rIcon)
+       { if (*this == rIcon) Ref(rIcon); return *this; }
+    inline bool operator == (const wxIcon& rIcon)
+       { return m_refData == rIcon.m_refData; }
+    inline bool operator != (const wxIcon& rIcon)
+       { return m_refData != rIcon.m_refData; }
+
+    wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
+
+    inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }
+    inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
+
+protected:
+    virtual wxGDIImageRefData* CreateData() const
+    {
+        return new wxIconRefData;
+    }
 
+private:
+    DECLARE_DYNAMIC_CLASS(wxIcon)
 };
 
 #endif
     // _WX_ICON_H_
-