Use proper format in wxGTK clipboard selection handler.

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

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index 46c29a6c3a05f347b63a4998fcf7341ab4639558..21f8abd6b4af6e3123ed92d4448ec12f600b83a2 100644 (file)
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -50,11 +50,11 @@ public:
         // from XPM data
     wxIcon(const char* const* data) { CreateIconFromXpm(data); }
 #ifdef wxNEEDS_CHARPP
-    wxIcon(char **data) { CreateIconFromXpm(wx_const_cast(const char* const*, data)); }
+    wxIcon(char **data) { CreateIconFromXpm(const_cast<const char* const*>(data)); }
 #endif
         // from resource/file
     wxIcon(const wxString& name,
-           wxBitmapType type = wxBITMAP_TYPE_ICO_RESOURCE,
+           wxBitmapType type = wxICON_DEFAULT_TYPE,
            int desiredWidth = -1, int desiredHeight = -1);
 
     wxIcon(const wxIconLocation& loc);
@@ -62,7 +62,7 @@ public:
     virtual ~wxIcon();
 
     virtual bool LoadFile(const wxString& name,
-                          wxBitmapType type = wxBITMAP_TYPE_ICO_RESOURCE,
+                          wxBitmapType type = wxICON_DEFAULT_TYPE,
                           int desiredWidth = -1, int desiredHeight = -1);
 
     // implementation only from now on