]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix harmless warnings about hiding base class virtual in dialogs sample.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sat, 28 Apr 2012 22:24:50 +0000 (22:24 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sat, 28 Apr 2012 22:24:50 +0000 (22:24 +0000)
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
samples/dialogs/dialogs.h

index d9c650ae2955bd767ca01bd99572c1ba4646024f..d4c7b8f6f6beb00daccaf48083ef4b2d8a415b3a 100644 (file)
@@ -3143,7 +3143,7 @@ void TestMessageBoxDialog::PrepareMessageDialog(wxMessageDialogBase &dlg)
 
 void TestMessageBoxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
 {
 
 void TestMessageBoxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
 {
-    wxMessageDialog dlg(this, GetMessage(), GetTitle(), GetStyle());
+    wxMessageDialog dlg(this, GetMessage(), GetBoxTitle(), GetStyle());
     PrepareMessageDialog(dlg);
 
     wxString btnName;
     PrepareMessageDialog(dlg);
 
     wxString btnName;
@@ -3231,7 +3231,7 @@ void TestRichMessageDialog::AddAdditionalFlags(wxSizer *sizer)
 
 void TestRichMessageDialog::OnApply(wxCommandEvent& WXUNUSED(event))
 {
 
 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(),
     PrepareMessageDialog(dlg);
 
     dlg.ShowCheckBox(m_textCheckBox->GetValue(),
index 68dc77d2a4724299d3f4a8b01199e5cc85f5d39b..54a2fe31383ec57cdf344319b883cc78b3a2810c 100644 (file)
@@ -208,7 +208,7 @@ public:
     bool Create();
 
 protected:
     bool Create();
 
 protected:
-    wxString GetTitle() { return m_textTitle->GetValue(); }
+    wxString GetBoxTitle() { return m_textTitle->GetValue(); }
     wxString GetMessage() { return m_textMsg->GetValue(); }
     long GetStyle();
 
     wxString GetMessage() { return m_textMsg->GetValue(); }
     long GetStyle();