X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..5fd588d2298a44428ac66bef1e4d9fc73e18d4fd:/include/wx/image.h diff --git a/include/wx/image.h b/include/wx/image.h index 6d025c286b..ea439aab62 100644 --- a/include/wx/image.h +++ b/include/wx/image.h @@ -44,7 +44,7 @@ class WXDLLEXPORT wxImageHandler: public wxObject { public: wxImageHandler() - : m_name(""), m_extension(""), m_mime(), m_type(0) + : m_name(wxT("")), m_extension(wxT("")), m_mime(), m_type(0) { } #if wxUSE_STREAMS @@ -121,7 +121,7 @@ public: wxImage( const wxImage* image ); #if WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI - // convertion to/from wxBitmap (deprecated, use wxBitmap's methods instead): + // conversion to/from wxBitmap (deprecated, use wxBitmap's methods instead): wxImage( const wxBitmap &bitmap ); wxBitmap ConvertToBitmap() const; #ifdef __WXGTK__ @@ -248,9 +248,9 @@ public: return *this; } - bool operator == (const wxImage& image) + bool operator == (const wxImage& image) const { return m_refData == image.m_refData; } - bool operator != (const wxImage& image) + bool operator != (const wxImage& image) const { return m_refData != image.m_refData; } static wxList& GetHandlers() { return sm_handlers; }