]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/os2/icon.h
don't draw borders for bitmap buttons with wxBORDER_NONE style
[wxWidgets.git] / include / wx / os2 / icon.h
index 5ccf5424a0982a3fa340d38076a30c44de5c7c07..d289bc0f4ca8243d9b71bcff6b278ce1f87ee588 100644 (file)
@@ -46,10 +46,10 @@ public:
           );
     wxIcon(const char* const* ppData) { CreateIconFromXpm(ppData); }
 #ifdef wxNEEDS_CHARPP
-    wxIcon(char** ppData) { CreateIconFromXpm(wx_const_cast(const char* const*, ppData)); }
+    wxIcon(char** ppData) { CreateIconFromXpm(const_cast<const char* const*>(ppData)); }
 #endif
     wxIcon( const wxString& rName
-           ,long            lFlags = wxBITMAP_TYPE_ICO_RESOURCE
+           ,wxBitmapType    lFlags = wxICON_DEFAULT_TYPE
            ,int             nDesiredWidth = -1
            ,int             nDesiredHeight = -1
           );
@@ -61,7 +61,7 @@ public:
     virtual ~wxIcon();
 
     bool LoadFile( const wxString& rName
-                  ,long            lFlags = wxBITMAP_TYPE_ICO_RESOURCE
+                  ,wxBitmapType    lFlags = wxICON_DEFAULT_TYPE
                   ,int             nDesiredWidth = -1
                   ,int             nDesiredHeight = -1
                  );