make access specifiers for the virtual functions match their access in the base class (patch 1400131)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-02-08 21:47:09 +00:00
parent e4ccedf7b2
commit 6f02a879ed
133 changed files with 611 additions and 533 deletions

View File

@@ -156,6 +156,8 @@ public:
bool ScrollList( int dx, int dy );
bool SortItems( wxListCtrlCompare fn, long data );
bool Update( long item );
// Must provide overload to avoid hiding it (and warnings about it)
virtual void Update() { wxControl::Update(); }
// are we in report mode?
bool InReportView() const { return HasFlag(wxLC_REPORT); }
@@ -208,13 +210,9 @@ public:
virtual wxDropTarget *GetDropTarget() const;
#endif
virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
virtual bool ShouldInheritColours() const { return false; }
virtual void SetFocus();
virtual wxSize DoGetBestSize() const;
// implementation
// --------------
@@ -229,6 +227,10 @@ public:
wxCoord m_headerHeight;
protected:
virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
virtual wxSize DoGetBestSize() const;
// return the text for the given column of the given item
virtual wxString OnGetItemText(long item, long column) const;
@@ -247,9 +249,6 @@ protected:
friend class WXDLLEXPORT wxListMainWindow;
private:
// Virtual function hiding supression
virtual void Update() { wxWindow::Update(); }
// create the header window
void CreateHeaderWindow();