wxTreeCtrl Mac look

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

diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h
index 7dc24e2716368e255320c5badef7312f224f7104..11f9980a334c875e66ed984de3793975c85eb27c 100644 (file)
--- a/include/wx/gtk/checklst.h
+++ b/include/wx/gtk/checklst.h
@@ -16,36 +16,40 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_CHECKLISTBOX
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/listbox.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
 
-class wxCheckListBox;
+// 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(' ')
+
+    #define wxCHECKLBOX_STRING    _T("[ ] ")
+#endif
 
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // wxCheckListBox
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
 class wxCheckListBox : public wxListBox
 {
-DECLARE_DYNAMIC_CLASS(wxCheckListBox)
-
 public:
     wxCheckListBox();
     wxCheckListBox(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             int nStrings = 0,
-#if defined(__SUNCC__)
-            const wxString choices[] = NULL,
-#else
-            const wxString choices[] = (const wxString *) NULL,
-#endif
+            const wxString *choices = (const wxString *)NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr);
@@ -54,7 +58,11 @@ public:
     void Check( int index, bool check = TRUE );
 
     int GetItemHeight() const;
+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 };
 
 #endif
-        //__GTKCHECKLISTH__
+
+#endif   //__GTKCHECKLISTH__