X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ac883a0d005437c97a60d8195bd5e4719b1154..236a9de39afa090fdee3cf91cb5364ceca69e3f8:/src/gtk/checklst.cpp

diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index 57bd258ee1..0390914207 100644
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -13,8 +13,10 @@
 
 #include "wx/checklst.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#if wxUSE_CHECKLISTBOX
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // wxCheckListBox
@@ -42,7 +44,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 
 bool wxCheckListBox::IsChecked( int index ) const
 {
-    wxCHECK_MSG( m_list != NULL, FALSE, _T("invalid checklistbox") );
+    wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid checklistbox") );
 
     GList *child = g_list_nth( m_list->children, index );
     if (child)
@@ -50,18 +52,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 = wxString(label->label,*wxConvCurrent);
 
-        return (str[1] == 'X');
+        return (str.GetChar(1) == wxT('X'));
     }
 
-    wxFAIL_MSG(_T("wrong checklistbox index"));
+    wxFAIL_MSG(wxT("wrong checklistbox index"));
     return FALSE;
 }
 
 void wxCheckListBox::Check( int index, bool check )
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid checklistbox") );
+    wxCHECK_RET( m_list != NULL, wxT("invalid checklistbox") );
 
     GList *child = g_list_nth( m_list->children, index );
     if (child)
@@ -69,21 +71,21 @@ 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 = wxString(label->label,*wxConvCurrent);
 
-        if (check == (str[1] == _T('X'))) return;
+        if (check == (str.GetChar(1) == wxT('X'))) return;
 
         if (check)
-            str.SetChar( 1, _T('X') );
+            str.SetChar( 1, wxT('X') );
         else
-            str.SetChar( 1, _T('-') );
+            str.SetChar( 1, wxT('-') );
 
         gtk_label_set( label, str.mbc_str() );
 
         return;
     }
 
-    wxFAIL_MSG(_T("wrong checklistbox index"));
+    wxFAIL_MSG(wxT("wrong checklistbox index"));
 }
 
 int wxCheckListBox::GetItemHeight() const
@@ -91,3 +93,5 @@ int wxCheckListBox::GetItemHeight() const
     // FIXME
     return 22;
 }
+
+#endif