From 05a0f97caf330c2c8e43a37cba7bf2188361e260 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 19 Mar 2015 16:42:17 +0100 Subject: [PATCH] Bracket MacNewFile() with __WXMAC__ checks in the docview sample. This fixes compilation in C++11 mode: "override" results in an error on non-Mac platforms because this method doesn't exist there and so can't be overridden. Closes #16903. --- samples/docview/docview.cpp | 2 ++ samples/docview/docview.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp index cf0c52477c..c06246e6a5 100644 --- a/samples/docview/docview.cpp +++ b/samples/docview/docview.cpp @@ -152,10 +152,12 @@ bool MyApp::OnCmdLineParsed(wxCmdLineParser& parser) return wxApp::OnCmdLineParsed(parser); } +#ifdef __WXMAC__ void MyApp::MacNewFile() { wxDocManager::GetDocumentManager()->CreateNewDocument(); } +#endif // __WXMAC__ bool MyApp::OnInit() { diff --git a/samples/docview/docview.h b/samples/docview/docview.h index e4a459254f..a5eba7dfbf 100644 --- a/samples/docview/docview.h +++ b/samples/docview/docview.h @@ -40,7 +40,9 @@ public: virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE; virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE; +#ifdef __WXMAC__ virtual void MacNewFile() wxOVERRIDE; +#endif // __WXMAC__ // our specific methods Mode GetMode() const { return m_mode; }