AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix uses of wxPalette without check for wxUSE_PALETTE

Browse Source
This commit is contained in:
Jeff Bland 2018-05-18 06:52:52 -06:00
parent 26715a1fe0
commit 8b18bbb9c7
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/dcgraph.h
View File

@ -83,7 +83,10 @@ public:
virtual void SetBrush(const wxBrush& brush) wxOVERRIDE;
virtual void SetBackground(const wxBrush& brush) wxOVERRIDE;
virtual void SetBackgroundMode(int mode) wxOVERRIDE;
#if wxUSE_PALETTE
virtual void SetPalette(const wxPalette& palette) wxOVERRIDE;
#endif
virtual void DestroyClippingRegion() wxOVERRIDE;

3
include/wx/gtk/dcclient.h
View File

@ -86,7 +86,10 @@ public:
virtual void SetTextForeground( const wxColour &col ) wxOVERRIDE;
virtual void SetTextBackground( const wxColour &col ) wxOVERRIDE;
virtual void SetBackgroundMode( int mode ) wxOVERRIDE;
#if wxUSE_PALETTE
virtual void SetPalette( const wxPalette& palette ) wxOVERRIDE;
#endif
virtual void DestroyClippingRegion() wxOVERRIDE;

2
src/common/dcgraph.cpp
View File

@ -457,10 +457,12 @@ void* wxGCDCImpl::GetHandle() const
return cgctx;
}
#if wxUSE_PALETTE
void wxGCDCImpl::SetPalette( const wxPalette& WXUNUSED(palette) )
{
}
#endif
void wxGCDCImpl::SetBackgroundMode( int mode )
{

2
src/gtk/dcclient.cpp
View File

@ -1863,10 +1863,12 @@ void wxWindowDCImpl::SetBackgroundMode( int mode )
m_backgroundMode = mode;
}
#if wxUSE_PALETTE
void wxWindowDCImpl::SetPalette( const wxPalette& WXUNUSED(palette) )
{
wxFAIL_MSG( wxT("wxWindowDCImpl::SetPalette not implemented") );
}
#endif
void wxWindowDCImpl::UpdateClipBox()
{