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

(blind) fix for virtual function hiding warning

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-02-15 12:16:33 +00:00
parent 853fab0276
commit d2fde247b6
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/combobox.h
View File

@@ -59,6 +59,10 @@ public:
virtual bool CanUndo() const = 0; virtual bool CanUndo() const = 0;
virtual bool CanRedo() const = 0; virtual bool CanRedo() const = 0;
// redeclare inherited SetSelection() overload here as well to avoid
// virtual function hiding
virtual void SetSelection(int n) = 0;
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

8
src/univ/combobox.cpp
View File

@@ -122,13 +122,15 @@ public:
virtual ~wxComboListBox(); virtual ~wxComboListBox();
// implement wxComboPopup methods // implement wxComboPopup methods
virtual bool SetSelection(const wxString& value); virtual bool SetSelection(const wxString& s);
virtual void SetSelection(int n, bool select)
{ wxListBox::SetSelection( n, select); };
virtual wxControl *GetControl() { return this; } virtual wxControl *GetControl() { return this; }
virtual void OnShow(); virtual void OnShow();
virtual wxCoord GetBestWidth() const; virtual wxCoord GetBestWidth() const;
// fix virtual function hiding
virtual void SetSelection(int n) { DoSetSelection(n, true); }
void SetSelection(int n, bool select) { DoSetSelection(n, select); }
protected: protected:
// we shouldn't return height too big from here // we shouldn't return height too big from here
virtual wxSize DoGetBestClientSize() const; virtual wxSize DoGetBestClientSize() const;