carbon cfm fixes

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

diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h
index 11f9980a334c875e66ed984de3793975c85eb27c..b2afb54cf3dd113ac9ebf5f74baa20ba608700a2 100644 (file)
--- a/include/wx/gtk/checklst.h
+++ b/include/wx/gtk/checklst.h
@@ -11,19 +11,10 @@
 #ifndef __GTKCHECKLISTH__
 #define __GTKCHECKLISTH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #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
 // ----------------------------------------------------------------------------
@@ -37,7 +28,7 @@
     #define wxCHECKLBOX_STRING    _T("[ ] ")
 #endif
 
-// ----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // wxCheckListBox
 // ----------------------------------------------------------------------------
 
@@ -53,6 +44,13 @@ public:
             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 );
@@ -63,6 +61,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 };
 
-#endif
-
 #endif   //__GTKCHECKLISTH__