X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a236aa2058ccf3d36e9cafc20fa7375080c4be50..558820fd083635d3e1dc026a56b2f14870cb5c38:/include/wx/gtk/choice.h?ds=sidebyside diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h index 1606120b09..4c24c8f524 100644 --- a/include/wx/gtk/choice.h +++ b/include/wx/gtk/choice.h @@ -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_