Make wxMDIParentFrame a regular top level window

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

diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h
index 8022f35658a92ec4886f7cda8f6571920919abb0..19d1ae02efbf15f3a267a60e61cf71c0dee9217d 100644 (file)
--- a/include/wx/gtk/checklst.h
+++ b/include/wx/gtk/checklst.h
@@ -11,33 +11,29 @@
 #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"
+// ----------------------------------------------------------------------------
+// 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
 {

-DECLARE_DYNAMIC_CLASS(wxCheckListBox)
-

 public:
     wxCheckListBox();
     wxCheckListBox(wxWindow *parent, wxWindowID id,
 public:
     wxCheckListBox();
     wxCheckListBox(wxWindow *parent, wxWindowID id,


@@ -53,8 +49,9 @@ 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__