X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a236aa2058ccf3d36e9cafc20fa7375080c4be50..bb2212e6c46d1a661d937450255ede09aff19ede:/include/wx/msw/choice.h?ds=sidebyside diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h index 3d004d2ab6..e069ec2a48 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; @@ -85,9 +84,22 @@ public: virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg); virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; + // returns true if the platform should explicitly apply a theme border + 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; } + void Init() + { + m_lastAcceptedSelection = wxID_NONE; + m_heightOwn = wxDefaultCoord; + } + + virtual void DoDeleteOneItem(unsigned int n); + virtual void DoClear(); virtual int DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, @@ -106,7 +118,10 @@ protected: // update the height of the drop down list to fit the number of items we // have (without changing the visible height) - void UpdateVisibleHeight(); + void MSWUpdateDropDownHeight(); + + // set the height of the visible part of the control to m_heightOwn + void MSWUpdateVisibleHeight(); // create and initialize the control bool CreateAndInit(wxWindow *parent, wxWindowID id, @@ -120,12 +135,18 @@ protected: // free all memory we have (used by Clear() and dtor) void Free(); +#if wxUSE_DEFERRED_SIZING + virtual void MSWEndDeferWindowPos(); +#endif // wxUSE_DEFERRED_SIZING // last "completed" selection, i.e. not the transient one while the user is // browsing the popup list: this is only used when != wxID_NONE which is // the case while the drop down is opened int m_lastAcceptedSelection; + // the height of the control itself if it was set explicitly or + // wxDefaultCoord if it hadn't + int m_heightOwn; DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice) };