X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d752a3c394b830405753476e508898988d502bfd..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/gtk1/checklst.cpp diff --git a/src/gtk1/checklst.cpp b/src/gtk1/checklst.cpp index 74064e190c..45bc4adc20 100644 --- a/src/gtk1/checklst.cpp +++ b/src/gtk1/checklst.cpp @@ -7,14 +7,20 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "checklst.h" #endif -#include "wx/checklst.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#include "wx/defs.h" #if wxUSE_CHECKLISTBOX +#include "wx/checklst.h" +#include "wx/gtk/private.h" + #include #include @@ -42,6 +48,19 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, wxListBox::Create( parent, id, pos, size, nStrings, choices, style, validator, name ); } +wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style, + const wxValidator& validator, + const wxString& name ) +{ + m_hasCheckBoxes = TRUE; + wxListBox::Create( parent, id, pos, size, choices, + style, validator, name ); +} + bool wxCheckListBox::IsChecked( int index ) const { wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid checklistbox") ); @@ -52,7 +71,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 +90,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; }