From cbabf356ce00eb70f677e8483f54062805730e14 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sat, 3 Aug 2013 04:48:46 +0000 Subject: [PATCH] remove ancient defines left over from GTK1 and some minor cleanup git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/checklst.h | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/include/wx/gtk/checklst.h b/include/wx/gtk/checklst.h index b414239..3cfbd76 100644 --- a/include/wx/gtk/checklst.h +++ b/include/wx/gtk/checklst.h @@ -7,21 +7,8 @@ // 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 @@ -35,7 +22,7 @@ public: 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); @@ -47,8 +34,8 @@ public: 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; @@ -58,4 +45,4 @@ private: DECLARE_DYNAMIC_CLASS(wxCheckListBox) }; -#endif //__GTKCHECKLISTH__ +#endif // _WX_GTKCHECKLIST_H_ -- 2.7.4