wxMDIChildFrame::Maximize() should have default value for its argument just as wxFram...

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

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index 3f138fb02a7bfdfef3d716b1779a2182bef69ba0..2f000c4aa4b08299050d44e09b1990868f579d2f 100644 (file)
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -16,23 +16,11 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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"
 #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
 {
 
 class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
 {


@@ -81,9 +69,9 @@ 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; }
        { return m_refData != rIcon.m_refData; }
 
     wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }