X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcf924a345ea8ffbc1cf6b40b5f75c6005e504c0..8912d7eb182ef5a5f95026a9ed239c9ad6c75915:/src/gtk1/checklst.cpp

diff --git a/src/gtk1/checklst.cpp b/src/gtk1/checklst.cpp
index 6c08581ae6..01e3bc7c54 100644
--- a/src/gtk1/checklst.cpp
+++ b/src/gtk1/checklst.cpp
@@ -11,12 +11,14 @@
 #pragma implementation "checklst.h"
 #endif
 
-#include "wx/checklst.h"
+#include "wx/defs.h"
 
 #if wxUSE_CHECKLISTBOX
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/checklst.h"
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // wxCheckListBox
@@ -30,13 +32,13 @@ wxCheckListBox::wxCheckListBox() : wxListBox()
 }
 
 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 );
@@ -44,7 +46,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)
@@ -52,18 +54,18 @@ bool wxCheckListBox::IsChecked( int index ) const
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
-        wxString str = wxString(label->label,*wxConv_current);
+        wxString str = wxString(label->label,*wxConvCurrent);
 
-        return (str[1] == _T('X'));
+        return str.GetChar(1) == wxCHECKLBOX_CHECKED;
     }
 
-    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)
@@ -73,19 +75,17 @@ void wxCheckListBox::Check( int index, bool check )
 
         wxString str = wxString(label->label,*wxConvCurrent);
 
-        if (check == (str[1] == _T('X'))) return;
+        if (check == (str.GetChar(1) == wxCHECKLBOX_CHECKED))
+            return;
 
-        if (check)
-            str.SetChar( 1, _T('X') );
-        else
-            str.SetChar( 1, _T('-') );
+        str.SetChar( 1, check ? wxCHECKLBOX_CHECKED : wxCHECKLBOX_UNCHECKED );
 
         gtk_label_set( label, str.mbc_str() );
 
         return;
     }
 
-    wxFAIL_MSG(_T("wrong checklistbox index"));
+    wxFAIL_MSG(wxT("wrong checklistbox index"));
 }
 
 int wxCheckListBox::GetItemHeight() const