X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/univ/checklst.h?ds=sidebyside diff --git a/include/wx/univ/checklst.h b/include/wx/univ/checklst.h index ee62327925..fc0bb91ca1 100644 --- a/include/wx/univ/checklst.h +++ b/include/wx/univ/checklst.h @@ -12,21 +12,17 @@ #ifndef _WX_UNIV_CHECKLST_H_ #define _WX_UNIV_CHECKLST_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univchecklst.h" -#endif - // ---------------------------------------------------------------------------- // actions // ---------------------------------------------------------------------------- -#define wxACTION_CHECKLISTBOX_TOGGLE _T("toggle") +#define wxACTION_CHECKLISTBOX_TOGGLE wxT("toggle") // ---------------------------------------------------------------------------- // wxCheckListBox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase +class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase { public: // ctors @@ -37,7 +33,7 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int nStrings = 0, - const wxString *choices = NULL, + const wxString choices[] = NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr) @@ -46,34 +42,53 @@ public: Create(parent, id, pos, size, nStrings, choices, style, validator, name); } + wxCheckListBox(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxListBoxNameStr); bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int nStrings = 0, - const wxString *choices = NULL, + const wxString choices[] = (const wxString *) NULL, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxListBoxNameStr); + bool Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr); // implement check list box methods - virtual bool IsChecked(size_t item) const; - virtual void Check(size_t item, bool check = TRUE); + virtual bool IsChecked(unsigned int item) const; + virtual void Check(unsigned int item, bool check = true); // and input handling virtual bool PerformAction(const wxControlAction& action, long numArg = -1l, const wxString& strArg = wxEmptyString); - // override all methods which add/delete items to update m_checks array as - // well - virtual void Delete(int n); + static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + { + return GetStdInputHandler(handlerDef); + } protected: - virtual int DoAppend(const wxString& item); - virtual void DoInsertItems(const wxArrayString& items, int pos); - virtual void DoSetItems(const wxArrayString& items, void **clientData); + // override all methods which add/delete items to update m_checks array as + // well + virtual void OnItemInserted(unsigned int pos); + virtual void DoDeleteOneItem(unsigned int n); virtual void DoClear(); // draw the check items instead of the usual ones @@ -93,21 +108,4 @@ private: DECLARE_DYNAMIC_CLASS(wxCheckListBox) }; -// ---------------------------------------------------------------------------- -// wxStdCheckListBoxInputHandler -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxStdCheckListboxInputHandler : public wxStdListboxInputHandler -{ -public: - wxStdCheckListboxInputHandler(wxInputHandler *inphand); - - virtual bool HandleKey(wxInputConsumer *consumer, - const wxKeyEvent& event, - bool pressed); - virtual bool HandleMouse(wxInputConsumer *consumer, - const wxMouseEvent& event); -}; - #endif // _WX_UNIV_CHECKLST_H_ -