try to autodetect Win32 macros

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

diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h
index b1856957a534433b95d2b4caf5705fd17cff998b..11f9980a334c875e66ed984de3793975c85eb27c 100644 (file)
--- a/include/wx/gtk1/checklst.h
+++ b/include/wx/gtk1/checklst.h
@@ -16,32 +16,40 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_CHECKLISTBOX
+

 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/listbox.h"
 
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/listbox.h"
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// 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 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,
 public:
     wxCheckListBox();
     wxCheckListBox(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             int nStrings = 0,

-            const wxString choices[] = (const wxString *) NULL,
+            const wxString *choices = (const wxString *)NULL,

             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr);
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr);


@@ -50,7 +58,11 @@ public:
     void Check( int index, bool check = TRUE );
 
     int GetItemHeight() const;
     void Check( int index, bool check = TRUE );
 
     int GetItemHeight() const;

+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxCheckListBox)

 };
 
 #endif
 };
 
 #endif

-        //__GTKCHECKLISTH__
+
+#endif   //__GTKCHECKLISTH__