X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f263f4542f0288a9aa2228f27f43e12a888e5a4..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/gtk/checklst.cpp diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp index e47e7bd805..fc1aa4602a 100644 --- a/src/gtk/checklst.cpp +++ b/src/gtk/checklst.cpp @@ -7,14 +7,22 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "checklst.h" #endif +// 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 "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // wxCheckListBox @@ -22,20 +30,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,7 +50,7 @@ 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) @@ -51,18 +58,18 @@ bool wxCheckListBox::IsChecked( int index ) const GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - wxString str = label->label; + wxString str( wxGTK_CONV_BACK( label->label ) ); - return (str[1] == 'X'); + 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) @@ -70,21 +77,19 @@ void wxCheckListBox::Check( int index, bool check ) GtkBin *bin = GTK_BIN( child->data ); GtkLabel *label = GTK_LABEL( bin->child ); - wxString str = label->label; + wxString str( wxGTK_CONV_BACK( label->label ) ); - if (check == (str[1] == 'X')) return; + if (check == (str.GetChar(1) == wxCHECKLBOX_CHECKED)) + return; - if (check) - str.SetChar( 1, 'X' ); - else - str.SetChar( 1, '-' ); + str.SetChar( 1, check ? wxCHECKLBOX_CHECKED : wxCHECKLBOX_UNCHECKED ); - gtk_label_set( label, str ); + gtk_label_set( label, wxGTK_CONV( str ) ); return; } - wxFAIL_MSG("wrong checklistbox index"); + wxFAIL_MSG(wxT("wrong checklistbox index")); } int wxCheckListBox::GetItemHeight() const @@ -92,3 +97,5 @@ int wxCheckListBox::GetItemHeight() const // FIXME return 22; } + +#endif