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
This commit is contained in:
Paul Cornett
2013-08-03 04:48:46 +00:00
parent 59f76658d3
commit cbabf356ce

View File

@@ -7,21 +7,8 @@
// Licence: wxWindows licence // Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#ifndef __GTKCHECKLISTH__ #ifndef _WX_GTKCHECKLIST_H_
#define __GTKCHECKLISTH__ #define _WX_GTKCHECKLIST_H_
// ----------------------------------------------------------------------------
// 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
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxCheckListBox // wxCheckListBox
@@ -35,7 +22,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
int nStrings = 0, int nStrings = 0,
const wxString *choices = (const wxString *)NULL, const wxString *choices = NULL,
long style = 0, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr); const wxString& name = wxListBoxNameStr);
@@ -47,8 +34,8 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr); const wxString& name = wxListBoxNameStr);
bool IsChecked(unsigned int index) const; virtual bool IsChecked(unsigned int index) const;
void Check(unsigned int index, bool check = true); virtual void Check(unsigned int index, bool check = true);
int GetItemHeight() const; int GetItemHeight() const;
@@ -58,4 +45,4 @@ private:
DECLARE_DYNAMIC_CLASS(wxCheckListBox) DECLARE_DYNAMIC_CLASS(wxCheckListBox)
}; };
#endif //__GTKCHECKLISTH__ #endif // _WX_GTKCHECKLIST_H_