X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/79c093419e9f7e15ac1293ef0c35eaf35ee2345a..66e9a9f0ae9cccd52b1a8f9828a3e054803fefb6:/include/wx/os2/icon.h

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index 035506f8c7..2f000c4aa4 100644
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -16,23 +16,11 @@
 // headers
 // ----------------------------------------------------------------------------
 
-// compatible (even if incorrect) behaviour by default: derive wxIcon from
-// wxBitmap
-#ifndef wxICON_IS_BITMAP
-    #define wxICON_IS_BITMAP 1
-#endif
-
 #include "wx/bitmap.h"
-#if wxICON_IS_BITMAP
+#include "wx/os2/gdiimage.h"
 
-    #define wxIconRefDataBase   wxBitmapRefData
-    #define wxIconBase          wxBitmap
-#else
-    #include "wx/os2/gdiimage.h"
-
-    #define wxIconRefDataBase   wxGDIImageRefData
-    #define wxIconBase          wxGDIImage
-#endif
+#define wxIconRefDataBase   wxGDIImageRefData
+#define wxIconBase          wxGDIImage
 
 class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
 {
@@ -66,6 +54,11 @@ public:
            ,int             nDesiredWidth = -1
            ,int             nDesiredHeight = -1
           );
+    wxIcon(const wxIconLocation& loc)
+    {
+        LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICO);
+    }
+
     ~wxIcon();
 
     bool LoadFile( const wxString& rName
@@ -76,9 +69,9 @@ public:
 
     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; }
-    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; }