Remove unnecessary Mac-specific TOOLKIT_LOWERCASE setting.

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

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index af4208791d177a52855ba3a32bd7d8d84f7e687d..d289bc0f4ca8243d9b71bcff6b278ce1f87ee588 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(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
           );


@@ -59,7 +61,7 @@ public:
     virtual ~wxIcon();
 
     bool LoadFile( const wxString& rName
     virtual ~wxIcon();
 
     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
                  );


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