added definition of TARGET_CARBON when compiling with non generated setup.h

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

diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h
index 11f9980a334c875e66ed984de3793975c85eb27c..19d1ae02efbf15f3a267a60e61cf71c0dee9217d 100644 (file)
--- a/include/wx/gtk1/checklst.h
+++ b/include/wx/gtk1/checklst.h
@@ -11,19 +11,10 @@
 #ifndef __GTKCHECKLISTH__
 #define __GTKCHECKLISTH__
 
 #ifndef __GTKCHECKLISTH__
 #define __GTKCHECKLISTH__
 

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

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

-#include "wx/defs.h"
-
-#if wxUSE_CHECKLISTBOX
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-#include "wx/listbox.h"
-

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------


@@ -37,7 +28,7 @@
     #define wxCHECKLBOX_STRING    _T("[ ] ")
 #endif
 
     #define wxCHECKLBOX_STRING    _T("[ ] ")
 #endif
 

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

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


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

-#endif
-

 #endif   //__GTKCHECKLISTH__
 #endif   //__GTKCHECKLISTH__