Implementing some more controls and an MDI child frame fix for wxFrame.

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

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index f2f109c2fbf9904cae8071137893e72c19d645b1..22160f236adfb0dd5f5932e2925f1309153baf51 100644 (file)
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -59,6 +59,8 @@ public:
            ,int        nWidth
            ,int        nHeight
           );
            ,int        nWidth
            ,int        nHeight
           );

+    inline wxIcon(const char** ppData) { CreateIconFromXpm(ppData); }
+    inline wxIcon(char** ppData) { CreateIconFromXpm((const char**)ppData); }

     wxIcon( const wxString& rName
            ,long            lFlags = wxBITMAP_TYPE_ICO_RESOURCE
            ,int             nDesiredWidth = -1
     wxIcon( const wxString& rName
            ,long            lFlags = wxBITMAP_TYPE_ICO_RESOURCE
            ,int             nDesiredWidth = -1


@@ -73,7 +75,7 @@ public:
                  );
 
     inline wxIcon& operator = (const wxIcon& rIcon)
                  );
 
     inline wxIcon& operator = (const wxIcon& rIcon)

-       { if (*this == rIcon) Ref(rIcon); return *this; }
+       { 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)
     inline bool operator == (const wxIcon& rIcon)
        { return m_refData == rIcon.m_refData; }
     inline bool operator != (const wxIcon& rIcon)


@@ -84,11 +86,13 @@ public:
     inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }
     inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
 
     inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }
     inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
 

+    void CopyFromBitmap(const wxBitmap& rBmp);

 protected:
     virtual wxGDIImageRefData* CreateData() const
     {
         return new wxIconRefData;
     }
 protected:
     virtual wxGDIImageRefData* CreateData() const
     {
         return new wxIconRefData;
     }

+    void    CreateIconFromXpm(const char **ppData);

 
 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)