Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h
index 19d1ae02efbf15f3a267a60e61cf71c0dee9217d..3cfbd764074bad210899804c7b8654d0a93cf2ce 100644 (file)
--- a/include/wx/gtk/checklst.h
+++ b/include/wx/gtk/checklst.h
@@ -1,38 +1,20 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

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

-// RCS-ID:      $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKCHECKLISTH__
-#define __GTKCHECKLISTH__
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
-#endif
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-// 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_STRING    _T("[ ] ")
-#endif
+#ifndef _WX_GTKCHECKLIST_H_
+#define _WX_GTKCHECKLIST_H_

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

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

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


@@ -40,18 +22,27 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             int nStrings = 0,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             int nStrings = 0,

-            const wxString *choices = (const wxString *)NULL,
+            const wxString *choices = NULL,
+            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);
 
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr);
 

-    bool IsChecked( int index ) const;
-    void Check( int index, bool check = TRUE );
+    virtual bool IsChecked(unsigned int index) const;
+    virtual 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   //__GTKCHECKLISTH__
+#endif   // _WX_GTKCHECKLIST_H_