Reuse wxMessageOutputStderr for wxLogStderr implementation.

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

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index 36ec8479e5f03a346ef71bec2cdcfef804954b42..268677d21bd5b6af0acf050ec68ebfc69b537f62 100644 (file)
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -50,7 +50,7 @@ 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,
@@ -65,6 +65,8 @@ public:
                           wxBitmapType type = wxICON_DEFAULT_TYPE,
                           int desiredWidth = -1, int desiredHeight = -1);
 
+    bool CreateFromHICON(WXHICON icon);
+
     // implementation only from now on
     wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }