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

Fix build with wxNO_RTTI

Browse Source 
Since CreateFromUnknownDC() can return NULL anyway, just always define it,
and have it always return NULL with wxNO_RTTI
See #17765
This commit is contained in:
Paul Cornett
2017-01-01 11:01:49 -08:00
parent caaa08be07
commit 5e906d80d8
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/graphics.h
View File

@@ -438,10 +438,8 @@ public:
#endif #endif
#endif #endif
#ifndef wxNO_RTTI
// Create a context from a DC of unknown type, if supported, returns NULL otherwise // Create a context from a DC of unknown type, if supported, returns NULL otherwise
static wxGraphicsContext* CreateFromUnknownDC(const wxDC& dc); static wxGraphicsContext* CreateFromUnknownDC(const wxDC& dc);
#endif
static wxGraphicsContext* CreateFromNative( void * context ); static wxGraphicsContext* CreateFromNative( void * context );

4
src/common/graphcmn.cpp
View File

@@ -926,9 +926,9 @@ wxGraphicsBitmap wxGraphicsContext::CreateSubBitmap( const wxGraphicsBitmap &bmp
#endif #endif
#endif #endif
#ifndef wxNO_RTTI
wxGraphicsContext* wxGraphicsContext::CreateFromUnknownDC(const wxDC& dc) wxGraphicsContext* wxGraphicsContext::CreateFromUnknownDC(const wxDC& dc)
{ {
#ifndef wxNO_RTTI
if ( const wxWindowDC *windc = dynamic_cast<const wxWindowDC*>(&dc) ) if ( const wxWindowDC *windc = dynamic_cast<const wxWindowDC*>(&dc) )
return Create(*windc); return Create(*windc);
@@ -946,10 +946,10 @@ wxGraphicsContext* wxGraphicsContext::CreateFromUnknownDC(const wxDC& dc)
return Create(*mfdc); return Create(*mfdc);
#endif #endif
#endif #endif
#endif // !wxNO_RTTI
return NULL; return NULL;
} }
#endif
wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context ) wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context )
{ {