]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/os2/icon.h
pressing PageDown and then PageUp should return to the same item
[wxWidgets.git] / include / wx / os2 / icon.h
index 383fd39e166d4bf16385d620beb6e36a6d67af78..035506f8c7b77b5acf3a0c535dcd317d3da624d4 100644 (file)
@@ -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
@@ -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
@@ -83,14 +85,21 @@ 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(); }
+    inline bool    IsXpm(void) const { return m_bIsXpm; };
+    inline const wxBitmap& GetXpmSrc(void) const { return m_vXpmSrc; }
 
 
+    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:
 
 private:
+    bool                            m_bIsXpm;
+    wxBitmap                        m_vXpmSrc;
+
     DECLARE_DYNAMIC_CLASS(wxIcon)
 };
 
     DECLARE_DYNAMIC_CLASS(wxIcon)
 };