X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/85ee88cd536cbf8b347e58f84b160b60204ed157..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/msw/listbox.h?ds=inline diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h index d8572170ab..8d8bd01a87 100644 --- a/include/wx/msw/listbox.h +++ b/include/wx/msw/listbox.h @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -38,7 +37,7 @@ class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase { public: // ctors and such - wxListBox(); + wxListBox() { Init(); } wxListBox(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, @@ -47,6 +46,8 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr) { + Init(); + Create(parent, id, pos, size, n, choices, style, validator, name); } wxListBox(wxWindow *parent, wxWindowID id, @@ -57,6 +58,8 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr) { + Init(); + Create(parent, id, pos, size, choices, style, validator, name); } @@ -93,7 +96,6 @@ public: // ownerdrawn wxListBox and wxCheckListBox support #if wxUSE_OWNER_DRAWN // override base class virtuals - virtual void Delete(unsigned int n); virtual bool SetFont(const wxFont &font); bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item); @@ -146,6 +148,8 @@ public: // returns true if the platform should explicitly apply a theme border virtual bool CanApplyThemeBorder() const { return false; } + virtual void OnInternalIdle(); + protected: virtual wxSize DoGetBestClientSize() const; @@ -165,8 +169,8 @@ protected: // this can't be called DoHitTest() because wxWindow already has this method virtual int DoHitTestList(const wxPoint& point) const; - bool m_updateHorizontalExtent; - virtual void OnInternalIdle(); + // free memory (common part of Clear() and dtor) + void Free(); unsigned int m_noItems; @@ -176,6 +180,18 @@ protected: #endif private: + // common part of all ctors + void Init(); + + // call this when items are added to or deleted from the listbox or an + // items text changes + void MSWOnItemsChanged(); + + // flag indicating whether the max horizontal extent should be updated, + // i.e. if we need to call SetHorizontalExtent() from OnInternalIdle() + bool m_updateHorizontalExtent; + + DECLARE_DYNAMIC_CLASS_NO_COPY(wxListBox) };