Application of the most recent wxWebView patch, the only changes were so tab to space...

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

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index 45ef0fd34b8b530152ea23f321b7bb5ecc4a5076..21f8abd6b4af6e3123ed92d4448ec12f600b83a2 100644 (file)
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -24,7 +24,7 @@
 
 // notice that although wxIconRefData inherits from wxBitmapRefData, it is not
 // a valid wxBitmapRefData
-class WXDLLEXPORT wxIconRefData : public wxGDIImageRefData
+class WXDLLIMPEXP_CORE wxIconRefData : public wxGDIImageRefData
 {
 public:
     wxIconRefData() { }
@@ -37,7 +37,7 @@ public:
 // Icon
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxIcon : public wxGDIImage
+class WXDLLIMPEXP_CORE wxIcon : public wxGDIImage
 {
 public:
     // ctors
@@ -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