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

Fix drawing sample compilation when wxUSE_GRAPHICS_CONTEXT==0

Browse Source 
'File_ShowGraphics' constant is not defined in this case so it cannot be referred to.
This commit is contained in:
Artur Wieczorek
2017-03-25 20:58:04 +01:00
parent 1f20b73c11
commit 716f42b416
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/drawing/drawing.cpp
View File

@@ -1905,7 +1905,11 @@ void MyCanvas::Draw(wxDC& pdc)
// For drawing with raw wxGraphicsContext // For drawing with raw wxGraphicsContext
// there is no bounding box to obtain. // there is no bounding box to obtain.
if ( m_showBBox && m_show != File_ShowGraphics) if ( m_showBBox
#if wxUSE_GRAPHICS_CONTEXT
&& m_show != File_ShowGraphics
#endif // wxUSE_GRAPHICS_CONTEXT
)
{ {
dc.SetPen(wxPen(wxColor(0, 128, 0), 1, wxPENSTYLE_DOT)); dc.SetPen(wxPen(wxColor(0, 128, 0), 1, wxPENSTYLE_DOT));
dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.SetBrush(*wxTRANSPARENT_BRUSH);
@@ -2269,12 +2273,12 @@ void MyFrame::OnSave(wxCommandEvent& WXUNUSED(event))
#if wxUSE_SVG #if wxUSE_SVG
if (ext == wxT("svg")) if (ext == wxT("svg"))
{ {
#if wxUSE_GRAPHICS_CONTEXT
// Graphics screen can only be drawn using GraphicsContext // Graphics screen can only be drawn using GraphicsContext
if (m_canvas->GetPage() == File_ShowGraphics) { if (m_canvas->GetPage() == File_ShowGraphics) {
wxLogMessage("Graphics screen can not be saved as SVG."); wxLogMessage("Graphics screen can not be saved as SVG.");
return; return;
} }
#if wxUSE_GRAPHICS_CONTEXT
wxGraphicsRenderer* tempRenderer = m_canvas->GetRenderer(); wxGraphicsRenderer* tempRenderer = m_canvas->GetRenderer();
m_canvas->UseGraphicRenderer(NULL); m_canvas->UseGraphicRenderer(NULL);
#endif #endif
@@ -2290,13 +2294,13 @@ void MyFrame::OnSave(wxCommandEvent& WXUNUSED(event))
#if wxUSE_POSTSCRIPT #if wxUSE_POSTSCRIPT
if ( ext == wxS("ps") ) if ( ext == wxS("ps") )
{ {
#if wxUSE_GRAPHICS_CONTEXT
// Graphics screen can only be drawn using wxGraphicsContext // Graphics screen can only be drawn using wxGraphicsContext
if ( m_canvas->GetPage() == File_ShowGraphics ) if (m_canvas->GetPage() == File_ShowGraphics)
{ {
wxLogMessage("Graphics screen can not be saved as PostScript file."); wxLogMessage("Graphics screen can not be saved as PostScript file.");
return; return;
} }
#if wxUSE_GRAPHICS_CONTEXT
wxGraphicsRenderer* curRenderer = m_canvas->GetRenderer(); wxGraphicsRenderer* curRenderer = m_canvas->GetRenderer();
m_canvas->UseGraphicRenderer(NULL); m_canvas->UseGraphicRenderer(NULL);
#endif // wxUSE_GRAPHICS_CONTEXT #endif // wxUSE_GRAPHICS_CONTEXT
@@ -2479,7 +2483,11 @@ void MyFrame::OnBoundingBox(wxCommandEvent& evt)
void MyFrame::OnBoundingBoxUpdateUI(wxUpdateUIEvent& evt) void MyFrame::OnBoundingBoxUpdateUI(wxUpdateUIEvent& evt)
{ {
#if wxUSE_GRAPHICS_CONTEXT
evt.Enable(m_canvas->GetPage() != File_ShowGraphics); evt.Enable(m_canvas->GetPage() != File_ShowGraphics);
#else
wxUnusedVar(evt);
#endif // wxUSE_GRAPHICS_CONTEXT / !wxUSE_GRAPHICS_CONTEXT
} }
void MyFrame::PrepareDC(wxDC& dc) void MyFrame::PrepareDC(wxDC& dc)