X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c48d0d37c22b74ce0ff9f324c7426892b5d57332..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/os2/icon.h diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h index a67359aac8..83cef7afa1 100644 --- 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: @@ -25,7 +25,7 @@ class WXDLLIMPEXP_CORE wxIconRefData: public wxIconRefDataBase { public: - wxIconRefData() { }; + wxIconRefData() { } virtual ~wxIconRefData() { Free(); } virtual void Free(); @@ -46,7 +46,7 @@ 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(ppData)); } #endif wxIcon( const wxString& rName ,wxBitmapType lFlags = wxICON_DEFAULT_TYPE @@ -70,7 +70,7 @@ public: inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); } inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); } - inline bool IsXpm(void) const { return m_bIsXpm; }; + inline bool IsXpm(void) const { return m_bIsXpm; } inline const wxBitmap& GetXpmSrc(void) const { return m_vXpmSrc; } void CopyFromBitmap(const wxBitmap& rBmp);