Fix for unhiding the other version of the base class HitTest

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

diff --git a/include/wx/motif/checklst.h b/include/wx/motif/checklst.h
index 554ee2e6e559b58f284702ea449eb2fd06e2777d..f097bd739f0eba22e874ba6ba489331caf31015d 100644 (file)
--- a/include/wx/motif/checklst.h
+++ b/include/wx/motif/checklst.h
@@ -13,35 +13,69 @@
 #ifndef _WX_CHECKLST_H_
 #define _WX_CHECKLST_H_
 
-#ifdef __GNUG__
-    #pragma interface "checklst.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#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)
+        
 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
     bool IsChecked(size_t uiIndex) const;
     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()
 };
 
 #endif
-    // _WX_CHECKLST_H_
+// _WX_CHECKLST_H_