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

replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-02 02:39:52 +00:00
parent 6fc905e0e1
commit 5c33522fca
174 changed files with 347 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/image.cpp
View File

@@ -123,7 +123,7 @@ wxImage wxNullImage;
//-----------------------------------------------------------------------------
#define M_IMGDATA wx_static_cast(wxImageRefData*, m_refData)
#define M_IMGDATA static_cast<wxImageRefData*>(m_refData)
IMPLEMENT_DYNAMIC_CLASS(wxImage, wxObject)
@@ -252,7 +252,7 @@ wxObjectRefData* wxImage::CreateRefData() const
wxObjectRefData* wxImage::CloneRefData(const wxObjectRefData* that) const
{
const wxImageRefData* refData = wx_static_cast(const wxImageRefData*, that);
const wxImageRefData* refData = static_cast<const wxImageRefData*>(that);
wxCHECK_MSG(refData->m_ok, NULL, wxT("invalid image") );
wxImageRefData* refData_new = new wxImageRefData;
@@ -1390,7 +1390,7 @@ wxImage wxImage::ConvertToGreyscale( double lr, double lg, double lb ) const
{
// calculate the luma
double luma = (src[0] * lr + src[1] * lg + src[2] * lb) + 0.5;
dest[0] = dest[1] = dest[2] = wx_static_cast(unsigned char, luma);
dest[0] = dest[1] = dest[2] = static_cast<unsigned char>(luma);
}
}
@@ -2288,7 +2288,7 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
bool wxImage::DoSave(wxImageHandler& handler, wxOutputStream& stream) const
{
wxImage * const self = wx_const_cast(wxImage *, this);
wxImage * const self = const_cast<wxImage *>(this);
if ( !handler.SaveFile(self, stream) )
return false;