X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbe0af5b15f8b8e95ed45abc2140fb3a1fac3c87..8b3fddc49326c0b6019cd7082218726aa17a5727:/src/gtk/checklst.cpp?ds=sidebyside diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp index 82fb96dc1a..01e3bc7c54 100644 --- a/src/gtk/checklst.cpp +++ b/src/gtk/checklst.cpp @@ -4,17 +4,21 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ #pragma implementation "checklst.h" #endif +#include "wx/defs.h" + +#if wxUSE_CHECKLISTBOX + #include "wx/checklst.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // wxCheckListBox @@ -22,20 +26,19 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox,wxListBox) -wxCheckListBox::wxCheckListBox() : - wxListBox() +wxCheckListBox::wxCheckListBox() : wxListBox() { m_hasCheckBoxes = TRUE; } 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 ); @@ -43,51 +46,52 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id, bool wxCheckListBox::IsChecked( int index ) const { - wxCHECK_MSG( m_list != NULL, FALSE, "invalid checklistbox" ); - + wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid checklistbox") ); + GList *child = g_list_nth( m_list->children, index ); if (child) { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str = label->label; - - return (str[1] == 'X'); + + wxString str = wxString(label->label,*wxConvCurrent); + + return str.GetChar(1) == wxCHECKLBOX_CHECKED; } - - wxFAIL_MSG("wrong checklistbox index"); + + wxFAIL_MSG(wxT("wrong checklistbox index")); return FALSE; } void wxCheckListBox::Check( int index, bool check ) { - wxCHECK_RET( m_list != NULL, "invalid checklistbox" ); - + wxCHECK_RET( m_list != NULL, wxT("invalid checklistbox") ); + GList *child = g_list_nth( m_list->children, index ); if (child) { GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - - wxString str = label->label; - - if (check == (str[1] == 'X')) return; - - if (check) - str.SetChar( 1, 'X' ); - else - str.SetChar( 1, '-' ); - - gtk_label_set( label, str ); - - return; + + wxString str = wxString(label->label,*wxConvCurrent); + + if (check == (str.GetChar(1) == wxCHECKLBOX_CHECKED)) + return; + + str.SetChar( 1, check ? wxCHECKLBOX_CHECKED : wxCHECKLBOX_UNCHECKED ); + + gtk_label_set( label, str.mbc_str() ); + + return; } - - wxFAIL_MSG("wrong checklistbox index"); + + wxFAIL_MSG(wxT("wrong checklistbox index")); } -int wxCheckListBox::GetItemHeight() +int wxCheckListBox::GetItemHeight() const { + // FIXME return 22; } + +#endif