Remove no longer used header.

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

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index 22160f236adfb0dd5f5932e2925f1309153baf51..ca57b257cc809ad7b0b51cb21ac3ff30bdcbac3f 100644 (file)
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -22,8 +22,8 @@
     #define wxICON_IS_BITMAP 1
 #endif
 
     #define wxICON_IS_BITMAP 1
 #endif
 

+#include "wx/bitmap.h"

 #if wxICON_IS_BITMAP
 #if wxICON_IS_BITMAP

-    #include "wx/bitmap.h"

 
     #define wxIconRefDataBase   wxBitmapRefData
     #define wxIconBase          wxBitmap
 
     #define wxIconRefDataBase   wxBitmapRefData
     #define wxIconBase          wxBitmap


@@ -66,6 +66,11 @@ public:
            ,int             nDesiredWidth = -1
            ,int             nDesiredHeight = -1
           );
            ,int             nDesiredWidth = -1
            ,int             nDesiredHeight = -1
           );

+    wxIcon(const wxIconLocation& loc)
+    {
+        LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICO);
+    }
+

     ~wxIcon();
 
     bool LoadFile( const wxString& rName
     ~wxIcon();
 
     bool LoadFile( const wxString& rName


@@ -76,15 +81,17 @@ public:
 
     inline wxIcon& operator = (const wxIcon& rIcon)
        { if (*this != rIcon) Ref(rIcon); return *this; }
 
     inline wxIcon& operator = (const wxIcon& rIcon)
        { if (*this != rIcon) Ref(rIcon); return *this; }

-    inline bool operator == (const wxIcon& rIcon)
+    inline bool operator == (const wxIcon& rIcon) const

        { return m_refData == rIcon.m_refData; }
        { return m_refData == rIcon.m_refData; }

-    inline bool operator != (const wxIcon& rIcon)
+    inline bool operator != (const wxIcon& rIcon) const

        { 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(); }
        { 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(); }

+    inline bool    IsXpm(void) const { return m_bIsXpm; };
+    inline const wxBitmap& GetXpmSrc(void) const { return m_vXpmSrc; }

 
     void CopyFromBitmap(const wxBitmap& rBmp);
 protected:
 
     void CopyFromBitmap(const wxBitmap& rBmp);
 protected:


@@ -95,6 +102,9 @@ protected:
     void    CreateIconFromXpm(const char **ppData);
 
 private:
     void    CreateIconFromXpm(const char **ppData);
 
 private:

+    bool                            m_bIsXpm;
+    wxBitmap                        m_vXpmSrc;
+

     DECLARE_DYNAMIC_CLASS(wxIcon)
 };
 
     DECLARE_DYNAMIC_CLASS(wxIcon)
 };