Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/image.h
View File

@@ -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
@@ -97,7 +97,7 @@ public:
WX_DECLARE_EXPORTED_HASH_MAP(unsigned long, wxImageHistogramEntry,
wxIntegerHash, wxIntegerEqual,
wxImageHistogram);
wxImageHistogram)
//-----------------------------------------------------------------------------
// wxImage
@@ -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; }