Rebake from clean wx tree.

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

diff --git a/include/wx/motif/checklst.h b/include/wx/motif/checklst.h
index 554ee2e6e559b58f284702ea449eb2fd06e2777d..7ec30059eb84aeb2d8eb87fd37c1da81622f111c 100644 (file)
--- a/include/wx/motif/checklst.h
+++ b/include/wx/motif/checklst.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        checklst.h
+// Name:        wx/motif/checklst.h

 // Purpose:     wxCheckListBox class - a listbox with checkable items
 //              Note: this is an optional class.
 // Author:      Julian Smart
 // Purpose:     wxCheckListBox class - a listbox with checkable items
 //              Note: this is an optional class.
 // Author:      Julian Smart


@@ -13,35 +13,65 @@
 #ifndef _WX_CHECKLST_H_
 #define _WX_CHECKLST_H_
 
 #ifndef _WX_CHECKLST_H_
 #define _WX_CHECKLST_H_
 

-#ifdef __GNUG__
-    #pragma interface "checklst.h"
-#endif
-

 #include "wx/listbox.h"
 
 #include "wx/listbox.h"
 

-class wxCheckListBox : public wxListBox
+class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase

 {
 {

-DECLARE_DYNAMIC_CLASS(wxCheckListBox)
+    DECLARE_DYNAMIC_CLASS(wxCheckListBox)

 
 public:
     // ctors
     wxCheckListBox();
     wxCheckListBox(wxWindow *parent, wxWindowID id,
 
 public:
     // ctors
     wxCheckListBox();
     wxCheckListBox(wxWindow *parent, wxWindowID id,

-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   int nStrings = 0, 
-                   const wxString choices[] = NULL,
-                   long style = 0,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxListBoxNameStr);
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        int nStrings = 0,
+        const wxString choices[] = NULL,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxListBoxNameStr);
+
+    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 n = 0, const wxString choices[] = 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);

 
     // items may be checked
 
     // 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);

 
 

+    // override base class functions
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
+    virtual int FindString(const wxString& s, bool bCase = false) const;
+    virtual void SetString(unsigned int n, const wxString& s);
+    virtual wxString GetString(unsigned int n) const;
+
+private:
+    void DoToggleItem( int item, int x );

 private:
     DECLARE_EVENT_TABLE()
 };
 
 #endif
 private:
     DECLARE_EVENT_TABLE()
 };
 
 #endif

-    // _WX_CHECKLST_H_
+// _WX_CHECKLST_H_