X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a047aff270905b377a81657a90f92eb3297157d0..99c4be680622f58a48a04dfe0835b59d2c41afea:/include/wx/msw/choice.h diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h index cff06ed33e..4f28ec07c2 100644 --- a/include/wx/msw/choice.h +++ b/include/wx/msw/choice.h @@ -16,7 +16,7 @@ // Choice item // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoice : public wxChoiceBase +class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase { public: // ctors @@ -66,8 +66,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr); - virtual void DoDeleteOneItem(unsigned int n); - virtual void DoClear(); + virtual void SetLabel(const wxString& label); virtual unsigned int GetCount() const; virtual int GetSelection() const; @@ -89,9 +88,15 @@ public: virtual bool CanApplyThemeBorder() const { return false; } protected: + // choose the default border for this window + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + // common part of all ctors void Init() { m_lastAcceptedSelection = wxID_NONE; } + virtual void DoDeleteOneItem(unsigned int n); + virtual void DoClear(); + virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, void **clientData, wxClientDataType type);