Add wxPanel::SetBackgroundBitmap().

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

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index 035506f8c7b77b5acf3a0c535dcd317d3da624d4..d289bc0f4ca8243d9b71bcff6b278ce1f87ee588 100644 (file)
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -16,25 +16,13 @@
 // 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

 
 

-    #define wxIconRefDataBase   wxGDIImageRefData
-    #define wxIconBase          wxGDIImage
-#endif
-
-class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
+class WXDLLIMPEXP_CORE wxIconRefData: public wxIconRefDataBase

 {
 public:
     wxIconRefData() { };
 {
 public:
     wxIconRefData() { };


@@ -47,40 +35,37 @@ public:
 // Icon
 // ---------------------------------------------------------------------------
 
 // Icon
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxIcon: public wxIconBase
+class WXDLLIMPEXP_CORE 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 char* const* ppData) { CreateIconFromXpm(ppData); }
+#ifdef wxNEEDS_CHARPP
+    wxIcon(char** ppData) { CreateIconFromXpm(const_cast<const char* const*>(ppData)); }
+#endif

     wxIcon( const wxString& rName
     wxIcon( const wxString& rName

-           ,long            lFlags = wxBITMAP_TYPE_ICO_RESOURCE
+           ,wxBitmapType    lFlags = wxICON_DEFAULT_TYPE

            ,int             nDesiredWidth = -1
            ,int             nDesiredHeight = -1
           );
            ,int             nDesiredWidth = -1
            ,int             nDesiredHeight = -1
           );

-    ~wxIcon();
+    wxIcon(const wxIconLocation& loc)
+    {
+        LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICO);
+    }
+
+    virtual ~wxIcon();

 
     bool LoadFile( const wxString& rName
 
     bool LoadFile( const wxString& rName

-                  ,long            lFlags = wxBITMAP_TYPE_ICO_RESOURCE
+                  ,wxBitmapType    lFlags = wxICON_DEFAULT_TYPE

                   ,int             nDesiredWidth = -1
                   ,int             nDesiredHeight = -1
                  );
 
                   ,int             nDesiredWidth = -1
                   ,int             nDesiredHeight = -1
                  );
 

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

     wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
 
     inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }
     wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
 
     inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }


@@ -94,7 +79,7 @@ protected:
     {
         return new wxIconRefData;
     }
     {
         return new wxIconRefData;
     }

-    void    CreateIconFromXpm(const char **ppData);
+    void    CreateIconFromXpm(const char* const* ppData);

 
 private:
     bool                            m_bIsXpm;
 
 private:
     bool                            m_bIsXpm;