From c8648b64a64029ec84a2f7ee234917d1fd5f4883 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 28 Apr 2012 22:24:50 +0000 Subject: [PATCH] Fix harmless warnings about hiding base class virtual in dialogs sample. GetTitle() added in r71213 resulted in virtual function warnings from g++, fix them by renaming it to GetBoxTitle(). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/dialogs/dialogs.cpp | 4 ++-- samples/dialogs/dialogs.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index d9c650ae29..d4c7b8f6f6 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -3143,7 +3143,7 @@ void TestMessageBoxDialog::PrepareMessageDialog(wxMessageDialogBase &dlg) void TestMessageBoxDialog::OnApply(wxCommandEvent& WXUNUSED(event)) { - wxMessageDialog dlg(this, GetMessage(), GetTitle(), GetStyle()); + wxMessageDialog dlg(this, GetMessage(), GetBoxTitle(), GetStyle()); PrepareMessageDialog(dlg); wxString btnName; @@ -3231,7 +3231,7 @@ void TestRichMessageDialog::AddAdditionalFlags(wxSizer *sizer) void TestRichMessageDialog::OnApply(wxCommandEvent& WXUNUSED(event)) { - wxRichMessageDialog dlg(this, GetMessage(), GetTitle(), GetStyle()); + wxRichMessageDialog dlg(this, GetMessage(), GetBoxTitle(), GetStyle()); PrepareMessageDialog(dlg); dlg.ShowCheckBox(m_textCheckBox->GetValue(), diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h index 68dc77d2a4..54a2fe3138 100644 --- a/samples/dialogs/dialogs.h +++ b/samples/dialogs/dialogs.h @@ -208,7 +208,7 @@ public: bool Create(); protected: - wxString GetTitle() { return m_textTitle->GetValue(); } + wxString GetBoxTitle() { return m_textTitle->GetValue(); } wxString GetMessage() { return m_textMsg->GetValue(); } long GetStyle(); -- 2.45.2