listctrl generic is used outside of osx-carbon

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

diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h
index cbdd0ee2334c1d9a12234417c86376bb7c3f0243..ba0368baae01f61f2c39725440ae3a2068f90928 100644 (file)
--- a/include/wx/gtk1/checklst.h
+++ b/include/wx/gtk1/checklst.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxCheckListBox class
 // Author:      Robert Roebling
 // Modified by:
 // Purpose:     wxCheckListBox class
 // Author:      Robert Roebling
 // Modified by:


@@ -11,30 +11,25 @@
 #ifndef __GTKCHECKLISTH__
 #define __GTKCHECKLISTH__
 
 #ifndef __GTKCHECKLISTH__
 #define __GTKCHECKLISTH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-#include "wx/listbox.h"
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------

 
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+// there is no "right" choice of the checkbox indicators, so allow the user to
+// define them himself if he wants
+#ifndef wxCHECKLBOX_CHECKED
+    #define wxCHECKLBOX_CHECKED   _T('x')
+    #define wxCHECKLBOX_UNCHECKED _T(' ')

 
 

-class wxCheckListBox;
+    #define wxCHECKLBOX_STRING    _T("[ ] ")
+#endif

 
 //-----------------------------------------------------------------------------
 // wxCheckListBox
 
 //-----------------------------------------------------------------------------
 // wxCheckListBox

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

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

 {
 {

-DECLARE_DYNAMIC_CLASS(wxCheckListBox)
-

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


@@ -45,12 +40,21 @@ 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 IsChecked( int index ) const;
-    void Check( int index, bool check = TRUE );
+    bool IsChecked(unsigned int index) const;
+    void Check(unsigned int index, bool check = true);

 
     int GetItemHeight() const;
 
     int GetItemHeight() const;

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxCheckListBox)

 };
 
 };
 

-#endif
-        //__GTKCHECKLISTH__
+#endif   //__GTKCHECKLISTH__