X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/071a2d78147df569d57b1ef138ab126a586b594d..e4315700228573d42a9afb1498fec4ee7b95ccb0:/src/gtk/checklst.cpp?ds=sidebyside diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp index 0390914207..01e3bc7c54 100644 --- a/src/gtk/checklst.cpp +++ b/src/gtk/checklst.cpp @@ -11,10 +11,12 @@ #pragma implementation "checklst.h" #endif -#include "wx/checklst.h" +#include "wx/defs.h" #if wxUSE_CHECKLISTBOX +#include "wx/checklst.h" + #include #include @@ -30,13 +32,13 @@ wxCheckListBox::wxCheckListBox() : wxListBox() } wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - int nStrings, - const wxString *choices, - long style, - const wxValidator& validator, - const wxString& name ) + const wxPoint& pos, + const wxSize& size, + int nStrings, + const wxString *choices, + long style, + const wxValidator& validator, + const wxString& name ) { m_hasCheckBoxes = TRUE; wxListBox::Create( parent, id, pos, size, nStrings, choices, style, validator, name ); @@ -54,7 +56,7 @@ bool wxCheckListBox::IsChecked( int index ) const wxString str = wxString(label->label,*wxConvCurrent); - return (str.GetChar(1) == wxT('X')); + return str.GetChar(1) == wxCHECKLBOX_CHECKED; } wxFAIL_MSG(wxT("wrong checklistbox index")); @@ -73,12 +75,10 @@ void wxCheckListBox::Check( int index, bool check ) wxString str = wxString(label->label,*wxConvCurrent); - if (check == (str.GetChar(1) == wxT('X'))) return; + if (check == (str.GetChar(1) == wxCHECKLBOX_CHECKED)) + return; - if (check) - str.SetChar( 1, wxT('X') ); - else - str.SetChar( 1, wxT('-') ); + str.SetChar( 1, check ? wxCHECKLBOX_CHECKED : wxCHECKLBOX_UNCHECKED ); gtk_label_set( label, str.mbc_str() );