X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1de4baa31f17548b32a376a71ce50fee6a3e759c..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/os2/checklst.h diff --git a/include/wx/os2/checklst.h b/include/wx/os2/checklst.h index 335e8c07ed..3c8773e99d 100644 --- a/include/wx/os2/checklst.h +++ b/include/wx/os2/checklst.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: checklst.h +// Name: wx/os2/checklst.h // Purpose: wxCheckListBox class - a listbox with checkable items // Note: this is an optional class. // Author: David Webster @@ -15,16 +15,14 @@ #include -#include "wx/setup.h" +#include "wx/defs.h" class wxOwnerDrawn; // so the compiler knows, it is a class. -class wxCheckListBoxItem; // fwd decl, define in checklst.cpp - -class WXDLLEXPORT wxCheckListBox : public wxListBox +class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase { public: - // + // // Ctors // wxCheckListBox(); @@ -35,69 +33,57 @@ public: ,int nStrings = 0 ,const wxString asChoices[] = NULL ,long lStyle = 0 -#if wxUSE_VALIDATORS ,const wxValidator& rValidator = wxDefaultValidator -#endif ,const wxString& rsName = wxListBoxNameStr ); + wxCheckListBox( wxWindow* pParent + ,wxWindowID vId + ,const wxPoint& rPos + ,const wxSize& vSize + ,const wxArrayString& asChoices + ,long lStyle = 0 + ,const wxValidator& rValidator = wxDefaultValidator + ,const wxString& rsName = wxListBoxNameStr + ); - // + // // Override base class virtuals // - virtual void Delete(int n); - virtual void InsertItems( int nItems - ,const wxString asItems[] - ,int nPos - ); + virtual void Delete(unsigned int n); virtual bool SetFont(const wxFont &rFont); - // + // // Items may be checked // - bool IsChecked(size_t uiIndex) const; - void Check( size_t uiIndex - ,bool bCheck = TRUE - ); + bool IsChecked(unsigned int uiIndex) const; + void Check(unsigned int uiIndex, bool bCheck = true); - // + // // Accessors // size_t GetItemHeight(void) 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* CreateItem(size_t n); - virtual bool OS2OnMeasure(WXMEASUREITEMSTRUCT* pItem); + virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* pItem); - // + // // Pressing space or clicking the check box toggles the item // void OnChar(wxKeyEvent& rEvent); void OnLeftClick(wxMouseEvent& rEvent); private: - size_t m_nItemHeight; // height of checklistbox items (the same for all) + size_t m_nItemHeight; // height of checklistbox items (the same for all) - // - // Virtual function hiding suppression, do not use - // - virtual wxControl* CreateItem( const wxItemResource* pChildResource - ,const wxItemResource* pParentResource - ,const wxResourceTable* pTable = (const wxResourceTable *) NULL - ) - { - return(wxWindowBase::CreateItem( pChildResource - ,pParentResource - ,pTable - )); - } DECLARE_DYNAMIC_CLASS(wxCheckListBox) DECLARE_EVENT_TABLE() -}; // end of CLASS wxCheckListBoxItem +}; // end of CLASS wxCheckListBox #endif // _WX_CHECKLST_H_