fixing 'id' objc.h collisions, listbox rewrite

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

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index c6b46a110f3e34dd9091d42f9708810f6d6a01f4..08f54374f2d158dd1c58cadf3e09029b28c5bc01 100644 (file)
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -16,34 +16,20 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-// compatible (even if incorrect) behaviour by default: derive wxIcon from
-// wxBitmap
-#ifndef wxICON_IS_BITMAP
-    #define wxICON_IS_BITMAP 1
-#endif
-
-#if wxICON_IS_BITMAP
-    #include "wx/bitmap.h"
-
-    #define wxIconRefDataBase   wxBitmapRefData
-    #define wxIconBase          wxBitmap
-#else
-    #include "wx/os2/gdiimage.h"
+#include "wx/bitmap.h"
+#include "wx/os2/gdiimage.h"

 
 

-    #define wxIconRefDataBase   wxGDIImageRefData
-    #define wxIconBase          wxGDIImage
-#endif
+#define wxIconRefDataBase   wxGDIImageRefData
+#define wxIconBase          wxGDIImage

 
 class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
 {
 public:
     wxIconRefData() { };
 
 class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
 {
 public:
     wxIconRefData() { };

-    virtual ~wxIconRefData() { Free(); m_hIcon = NULL; }
+    virtual ~wxIconRefData() { Free(); }

 
     virtual void Free();
 
     virtual void Free();

-public:
-    WXHICON m_hIcon;
-};
+}; // end of

 
 // ---------------------------------------------------------------------------
 // Icon
 
 // ---------------------------------------------------------------------------
 // Icon


@@ -54,18 +40,22 @@ class WXDLLEXPORT wxIcon: public wxIconBase
 public:
     wxIcon();
 
 public:
     wxIcon();
 

-    // Copy constructors
-    inline wxIcon(const wxIcon& icon) { Ref(icon); }
-

     wxIcon( const char bits[]
            ,int        nWidth
            ,int        nHeight
           );
     wxIcon( const char bits[]
            ,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
            ,int             nDesiredHeight = -1
           );
     wxIcon( const wxString& rName
            ,long            lFlags = wxBITMAP_TYPE_ICO_RESOURCE
            ,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


@@ -74,25 +64,30 @@ public:
                   ,int             nDesiredHeight = -1
                  );
 
                   ,int             nDesiredHeight = -1
                  );
 

-    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:
     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)
 };