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

avoid duplicate initialization and warnings about initialization order

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-09-24 03:39:30 +00:00
parent 175c299666
commit 7f7c619c85
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/generic/graphicc.cpp
View File

@@ -1323,7 +1323,7 @@ void wxCairoBitmapData::InitSurface(cairo_format_t format, int stride)
} }
wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, cairo_surface_t* bitmap ) : wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, cairo_surface_t* bitmap ) :
wxGraphicsBitmapData( renderer ), m_buffer(NULL) wxGraphicsBitmapData(renderer)
{ {
m_surface = bitmap; m_surface = bitmap;
m_pattern = cairo_pattern_create_for_surface(m_surface); m_pattern = cairo_pattern_create_for_surface(m_surface);
@@ -1333,8 +1333,12 @@ wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, cairo_surfac
m_buffer = NULL; m_buffer = NULL;
} }
wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitmap& bmp ) : wxGraphicsBitmapData( renderer ), m_buffer(NULL), m_surface(NULL), m_pattern(NULL) wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitmap& bmp )
: wxGraphicsBitmapData(renderer)
{ {
m_surface = NULL;
m_pattern = NULL;
m_buffer = NULL;
wxCHECK_RET( bmp.IsOk(), wxT("Invalid bitmap in wxCairoContext::DrawBitmap")); wxCHECK_RET( bmp.IsOk(), wxT("Invalid bitmap in wxCairoContext::DrawBitmap"));
#ifdef wxHAS_RAW_BITMAP #ifdef wxHAS_RAW_BITMAP