Remove unnecessary Mac-specific TOOLKIT_LOWERCASE setting.

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

diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h
index 11f9980a334c875e66ed984de3793975c85eb27c..c3aa5e6d83514db430bf4fbc2ed2b467f39f801f 100644 (file)
--- a/include/wx/gtk/checklst.h
+++ b/include/wx/gtk/checklst.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        checklst.h
+// Name:        wx/gtk/checklst.h

 // Purpose:     wxCheckListBox class
 // Author:      Robert Roebling
 // Modified by:
 // Purpose:     wxCheckListBox class
 // Author:      Robert Roebling
 // Modified by:


@@ -11,19 +11,6 @@
 #ifndef __GTKCHECKLISTH__
 #define __GTKCHECKLISTH__
 
 #ifndef __GTKCHECKLISTH__
 #define __GTKCHECKLISTH__
 

-#ifdef __GNUG__
-#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
 // ----------------------------------------------------------------------------


@@ -31,17 +18,17 @@
 // there is no "right" choice of the checkbox indicators, so allow the user to
 // define them himself if he wants
 #ifndef wxCHECKLBOX_CHECKED
 // 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(' ')
+    #define wxCHECKLBOX_CHECKED   wxT('x')
+    #define wxCHECKLBOX_UNCHECKED wxT(' ')

 
 

-    #define wxCHECKLBOX_STRING    _T("[ ] ")
+    #define wxCHECKLBOX_STRING    wxT("[ ] ")

 #endif
 
 #endif
 

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

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

-class wxCheckListBox : public wxListBox
+class WXDLLIMPEXP_CORE wxCheckListBox : public wxListBox

 {
 public:
     wxCheckListBox();
 {
 public:
     wxCheckListBox();


@@ -53,16 +40,23 @@ public:
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr);
             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 );
+    bool IsChecked(unsigned int index) const;
+    void Check(unsigned int index, bool check = true);

 
     int GetItemHeight() const;
 
     int GetItemHeight() const;

-    
+
+    void DoCreateCheckList();
+

 private:
     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 };
 

-#endif
-

 #endif   //__GTKCHECKLISTH__
 #endif   //__GTKCHECKLISTH__