X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..27cc91429d3cfaa5f2de6de299a97da89bdab799:/include/wx/msw/checklst.h diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h index 73385b20da..e347ba14fe 100644 --- a/include/wx/msw/checklst.h +++ b/include/wx/msw/checklst.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: checklst.h +// Name: wx/msw/checklst.h // Purpose: wxCheckListBox class - a listbox with checkable items // Author: Vadim Zeitlin // Modified by: @@ -12,10 +12,6 @@ #ifndef __CHECKLST__H_ #define __CHECKLST__H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "checklst.h" -#endif - #if !wxUSE_OWNER_DRAWN #error "wxCheckListBox class requires owner-drawn functionality." #endif @@ -60,13 +56,13 @@ public: const wxString& name = wxListBoxNameStr); // override base class virtuals - virtual void Delete(int n); + virtual void Delete(unsigned int n); virtual bool SetFont( const wxFont &font ); // items may be checked - virtual bool IsChecked(size_t uiIndex) const; - virtual void Check(size_t uiIndex, bool bCheck = TRUE); + virtual bool IsChecked(unsigned int uiIndex) const; + virtual void Check(unsigned int uiIndex, bool bCheck = true); // return the index of the item at this position or wxNOT_FOUND int HitTest(const wxPoint& pt) const { return DoHitTestItem(pt.x, pt.y); } @@ -75,12 +71,12 @@ public: // accessors size_t GetItemHeight() const { return m_nItemHeight; } -protected: // we create our items ourselves and they have non-standard size, // so we need to override these functions virtual wxOwnerDrawn *CreateLboxItem(size_t n); virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item); +protected: // this can't be called DoHitTest() because wxWindow already has this method int DoHitTestItem(wxCoord x, wxCoord y) const; @@ -88,6 +84,8 @@ protected: void OnKeyDown(wxKeyEvent& event); void OnLeftClick(wxMouseEvent& event); + wxSize DoGetBestSize() const; + private: size_t m_nItemHeight; // height of checklistbox items (the same for all)