Some compilation fixes

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

diff --git a/include/wx/gtk1/checklst.h b/include/wx/gtk1/checklst.h
index 7dc24e2716368e255320c5badef7312f224f7104..3290184e06a80db003d72f1195f9b71b5270a308 100644 (file)
--- a/include/wx/gtk1/checklst.h
+++ b/include/wx/gtk1/checklst.h
@@ -16,6 +16,9 @@
 #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/object.h"
 #include "wx/list.h"
 #include "wx/control.h"


@@ -33,19 +36,13 @@ class 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,

-#if defined(__SUNCC__)
-            const wxString choices[] = NULL,
-#else
-            const wxString choices[] = (const wxString *) NULL,
-#endif
+            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);


@@ -54,7 +51,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__