Add wxWebView backend wxUSE_ macros

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

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index 7ed62517f6f47d74821f4156b851ffef4bcc8213..4f2c392e99782b05b72904d7903e222a42f1c5be 100644 (file)
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        icon.h
+// Name:        wx/os2/icon.h
 // Purpose:     wxIcon class
 // Author:      David Webster
 // Modified by:
@@ -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
-           ,wxBitmapType    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
-                  ,wxBitmapType    lFlags = wxBITMAP_TYPE_ICO_RESOURCE
+                  ,wxBitmapType    lFlags = wxICON_DEFAULT_TYPE
                   ,int             nDesiredWidth = -1
                   ,int             nDesiredHeight = -1
                  );