No real changes, just clean up wxAbortProc mess.

[wxWidgets.git] / include / wx / univ / checklst.h

diff --git a/include/wx/univ/checklst.h b/include/wx/univ/checklst.h
index 619ab94038f1adfea26f178ae4a522b0e9423223..fc0bb91ca1d676016419df4b832faee7ed8da6f1 100644 (file)
--- a/include/wx/univ/checklst.h
+++ b/include/wx/univ/checklst.h
@@ -16,13 +16,13 @@
 // 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
@@ -78,14 +78,17 @@ public:
                                long numArg = -1l,
                                const wxString& strArg = wxEmptyString);
 
-    // override all methods which add/delete items to update m_checks array as
-    // well
-    virtual void Delete(unsigned 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, unsigned 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
@@ -105,20 +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_