avoid a bug in Carbon headers

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

diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h
index 3290184e06a80db003d72f1195f9b71b5270a308..aa26886c0f18248b748afd8e09c8627fe175b41c 100644 (file)
--- a/include/wx/gtk1/checklst.h
+++ b/include/wx/gtk1/checklst.h
@@ -11,28 +11,26 @@
 #ifndef __GTKCHECKLISTH__
 #define __GTKCHECKLISTH__
 
 #ifndef __GTKCHECKLISTH__
 #define __GTKCHECKLISTH__
 

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

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------

 
 

-#if wxUSE_CHECKLISTBOX
+// 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(' ')

 
 

-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-#include "wx/listbox.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxCheckListBox;
+    #define wxCHECKLBOX_STRING    _T("[ ] ")
+#endif

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

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

 
 class wxCheckListBox : public wxListBox
 {
 
 class wxCheckListBox : public wxListBox
 {


@@ -56,6 +54,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 };
 
     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 };
 

-#endif
-

 #endif   //__GTKCHECKLISTH__
 #endif   //__GTKCHECKLISTH__