Sorry, should be a __UNIX__ test

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

diff --git a/include/wx/motif/checklst.h b/include/wx/motif/checklst.h
index 3a0444f892fb0982813de543c467d4808b5423c1..9014e9f774c3fcdb23a88a2def73801a3e26ba96 100644 (file)
--- a/include/wx/motif/checklst.h
+++ b/include/wx/motif/checklst.h
@@ -13,13 +13,13 @@
 #ifndef _WX_CHECKLST_H_
 #define _WX_CHECKLST_H_
 
 #ifndef _WX_CHECKLST_H_
 #define _WX_CHECKLST_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "checklst.h"
 #endif
 
 #include "wx/listbox.h"
 
 #pragma interface "checklst.h"
 #endif
 
 #include "wx/listbox.h"
 

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

 {
     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
         
 {
     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
         


@@ -34,11 +34,45 @@ public:
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxListBoxNameStr);
         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
     bool IsChecked(size_t uiIndex) const;
     
     // items may be checked
     bool IsChecked(size_t uiIndex) const;

-    void Check(size_t uiIndex, bool bCheck = TRUE);
-    
+    void Check(size_t uiIndex, bool bCheck = true);
+
+    // override base class functions
+    virtual int DoAppend(const wxString& item);
+    virtual int FindString(const wxString& s) const;
+    virtual void SetString(int n, const wxString& s);
+    virtual wxString GetString(int n) const;
+
+    virtual void DoInsertItems(const wxArrayString& items, int pos);
+    virtual void DoSetItems(const wxArrayString& items, void **clientData);
+private:
+    void DoToggleItem( int item, int x );

 private:
     DECLARE_EVENT_TABLE()
 };
 private:
     DECLARE_EVENT_TABLE()
 };