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

Fix build with wxUSE_PALETTE==0

Browse Source
This commit is contained in:
Paul Cornett
2018-10-09 22:24:58 -07:00
parent e351bd513b
commit 4ad6f67147
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/dcsvg.h
View File

@@ -86,10 +86,12 @@ public:
virtual wxCoord GetCharHeight() const wxOVERRIDE; virtual wxCoord GetCharHeight() const wxOVERRIDE;
virtual wxCoord GetCharWidth() const wxOVERRIDE; virtual wxCoord GetCharWidth() const wxOVERRIDE;
#if wxUSE_PALETTE
virtual void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE virtual void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE
{ {
wxFAIL_MSG(wxT("wxSVGFILEDC::SetPalette not implemented")); wxFAIL_MSG(wxT("wxSVGFILEDC::SetPalette not implemented"));
} }
#endif
virtual void SetLogicalFunction(wxRasterOperationMode WXUNUSED(function)) wxOVERRIDE virtual void SetLogicalFunction(wxRasterOperationMode WXUNUSED(function)) wxOVERRIDE
{ {

2
include/wx/generic/dcpsg.h
View File

@@ -79,7 +79,9 @@ public:
virtual void ComputeScaleAndOrigin() wxOVERRIDE; virtual void ComputeScaleAndOrigin() wxOVERRIDE;
void SetBackgroundMode(int WXUNUSED(mode)) wxOVERRIDE { } void SetBackgroundMode(int WXUNUSED(mode)) wxOVERRIDE { }
#if wxUSE_PALETTE
void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE { } void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE { }
#endif
void SetPrintData(const wxPrintData& data); void SetPrintData(const wxPrintData& data);
wxPrintData& GetPrintData() { return m_printData; } wxPrintData& GetPrintData() { return m_printData; }

2
include/wx/gtk/print.h
View File

@@ -245,7 +245,9 @@ public:
wxSize GetPPI() const wxOVERRIDE; wxSize GetPPI() const wxOVERRIDE;
virtual int GetDepth() const wxOVERRIDE { return 24; } virtual int GetDepth() const wxOVERRIDE { return 24; }
void SetBackgroundMode(int mode) wxOVERRIDE; void SetBackgroundMode(int mode) wxOVERRIDE;
#if wxUSE_PALETTE
void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE { } void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE { }
#endif
void SetResolution(int ppi); void SetResolution(int ppi);
// overridden for wxPrinterDC Impl // overridden for wxPrinterDC Impl