Cast for argument to delete[] - VC6 doesn't want to delete a const pointer

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

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index 9c254a8353c17ba8c1151ba089014dd90e4fb44d..7ed62517f6f47d74821f4156b851ffef4bcc8213 100644 (file)
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -22,7 +22,7 @@
 #define wxIconRefDataBase   wxGDIImageRefData
 #define wxIconBase          wxGDIImage
 
 #define wxIconRefDataBase   wxGDIImageRefData
 #define wxIconBase          wxGDIImage
 

-class WXDLLEXPORT wxIconRefData: public wxIconRefDataBase
+class WXDLLIMPEXP_CORE wxIconRefData: public wxIconRefDataBase

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


@@ -35,7 +35,7 @@ public:
 // Icon
 // ---------------------------------------------------------------------------
 
 // Icon
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxIcon: public wxIconBase
+class WXDLLIMPEXP_CORE wxIcon: public wxIconBase

 {
 public:
     wxIcon();
 {
 public:
     wxIcon();


@@ -44,10 +44,12 @@ 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 char* const* ppData) { CreateIconFromXpm(ppData); }
+#ifdef wxNEEDS_CHARPP
+    wxIcon(char** ppData) { CreateIconFromXpm(wx_const_cast(const char* const*, ppData)); }
+#endif

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

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

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


@@ -59,16 +61,11 @@ public:
     virtual ~wxIcon();
 
     bool LoadFile( const wxString& rName
     virtual ~wxIcon();
 
     bool LoadFile( const wxString& rName

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

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

-    inline bool operator == (const wxIcon& rIcon) const
-       { return m_refData == rIcon.m_refData; }
-    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); }
     wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
 
     inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }


@@ -82,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;