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 c3aa5e6d83514db430bf4fbc2ed2b467f39f801f..3cfbd764074bad210899804c7b8654d0a93cf2ce 100644 (file)
--- a/include/wx/gtk/checklst.h
+++ b/include/wx/gtk/checklst.h
@@ -3,32 +3,18 @@
 // 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__
-
-// ----------------------------------------------------------------------------
-// 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   wxT('x')
-    #define wxCHECKLBOX_UNCHECKED wxT(' ')
-
-    #define wxCHECKLBOX_STRING    wxT("[ ] ")
-#endif
+#ifndef _WX_GTKCHECKLIST_H_
+#define _WX_GTKCHECKLIST_H_

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

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

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


@@ -36,7 +22,7 @@ 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);
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr);


@@ -48,8 +34,8 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr);
 
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr);
 

-    bool IsChecked(unsigned int index) const;
-    void Check(unsigned 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;
 


@@ -59,4 +45,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 };
 
     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 };
 

-#endif   //__GTKCHECKLISTH__
+#endif   // _WX_GTKCHECKLIST_H_