X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d752a3c394b830405753476e508898988d502bfd..6992d326eb1246d9d03f04245d0cd87eab65f6f7:/src/gtk/checklst.cpp diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp index 74064e190c..5a4f2469f5 100644 --- a/src/gtk/checklst.cpp +++ b/src/gtk/checklst.cpp @@ -11,10 +11,13 @@ #pragma implementation "checklst.h" #endif -#include "wx/checklst.h" +#include "wx/defs.h" #if wxUSE_CHECKLISTBOX +#include "wx/checklst.h" +#include "wx/gtk/private.h" + #include #include @@ -52,7 +55,7 @@ bool wxCheckListBox::IsChecked( int index ) const GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - wxString str = wxString(label->label,*wxConvCurrent); + wxString str( wxGTK_CONV_BACK( label->label ) ); return str.GetChar(1) == wxCHECKLBOX_CHECKED; } @@ -71,14 +74,14 @@ void wxCheckListBox::Check( int index, bool check ) GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - wxString str = wxString(label->label,*wxConvCurrent); + wxString str( wxGTK_CONV_BACK( label->label ) ); if (check == (str.GetChar(1) == wxCHECKLBOX_CHECKED)) return; str.SetChar( 1, check ? wxCHECKLBOX_CHECKED : wxCHECKLBOX_UNCHECKED ); - gtk_label_set( label, str.mbc_str() ); + gtk_label_set( label, wxGTK_CONV( str ) ); return; }