make access for virtuals match base

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-10-26 06:20:23 +00:00
parent 326a863afc
commit 3c75d8baf9
16 changed files with 65 additions and 68 deletions

View File

@@ -7,8 +7,8 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __GTKCHOICEH__
#define __GTKCHOICEH__
#ifndef _WX_GTK_CHOICE_H_
#define _WX_GTK_CHOICE_H_
class WXDLLIMPEXP_FWD_BASE wxSortedArrayString;
class WXDLLIMPEXP_FWD_BASE wxArrayString;
@@ -61,10 +61,6 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr );
// implement base class pure virtuals
void DoDeleteOneItem(unsigned int n);
void DoClear();
int GetSelection() const;
void SetSelection(int n);
@@ -77,6 +73,9 @@ public:
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
protected:
void DoDeleteOneItem(unsigned int n);
void DoClear();
wxArrayPtrVoid m_clientData; // contains the client data for the items
virtual wxSize DoGetBestSize() const;
@@ -108,4 +107,4 @@ private:
};
#endif // __GTKCHOICEH__
#endif // _WX_GTK_CHOICE_H_