X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..5d5da6f610400c6a6a7886b154adeb8a69772f98:/src/gtk/checklst.cpp diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp index de5d961859..01e3bc7c54 100644 --- a/src/gtk/checklst.cpp +++ b/src/gtk/checklst.cpp @@ -11,12 +11,14 @@ #pragma implementation "checklst.h" #endif -#include "wx/checklst.h" +#include "wx/defs.h" #if wxUSE_CHECKLISTBOX -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include "wx/checklst.h" + +#include +#include //----------------------------------------------------------------------------- // wxCheckListBox @@ -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[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[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() );