X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a047aff270905b377a81657a90f92eb3297157d0..cba4e486a4f8ab05674bac6ed8c6bfa58ab25131:/include/wx/msw/choice.h?ds=inline diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h index cff06ed33e..d17e1c655d 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,9 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxChoiceNameStr); - virtual void DoDeleteOneItem(unsigned int n); - virtual void DoClear(); + virtual bool Show(bool show = true); + + virtual void SetLabel(const wxString& label); virtual unsigned int GetCount() const; virtual int GetSelection() const; @@ -78,6 +79,14 @@ public: virtual wxString GetString(unsigned int n) const; virtual void SetString(unsigned int n, const wxString& s); + virtual wxVisualAttributes GetDefaultAttributes() const + { + return GetClassDefaultAttributes(GetWindowVariant()); + } + + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + // MSW only virtual bool MSWCommand(WXUINT param, WXWORD id); WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); @@ -89,8 +98,18 @@ 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; } + 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, @@ -107,9 +126,15 @@ protected: int width, int height, int sizeFlags = wxSIZE_AUTO); + // Show or hide the popup part of the control. + void MSWDoPopupOrDismiss(bool show); + // 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, @@ -123,12 +148,21 @@ protected: // free all memory we have (used by Clear() and dtor) void Free(); + // set the height for simple combo box + int SetHeightSimpleComboBox(int nItems) const; + +#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) };