X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..df53be12c55c077d9c2e1c479a1552188638495c:/include/wx/msw/choice.h diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h index 4f28ec07c2..c5cf8125be 100644 --- a/include/wx/msw/choice.h +++ b/include/wx/msw/choice.h @@ -77,6 +77,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); @@ -92,7 +100,11 @@ protected: 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(); @@ -114,7 +126,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, @@ -128,12 +143,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) };