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

Fix harmless warnings about hiding base class virtual in dialogs sample.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin 2012-04-28 22:24:50 +00:00
parent a55602fafa
commit c8648b64a6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/dialogs/dialogs.cpp
View File

@ -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(),

2
samples/dialogs/dialogs.h
View File

@ -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();