16-bit fixes

[wxWidgets.git] / src / gtk / checklst.cpp

diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index 6e97994417b488e5b0f3ceed1ba43226ad3054c5..03909142071d7529a9f627fe008c1f78dde0aa17 100644 (file)
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -15,8 +15,8 @@
 
 #if wxUSE_CHECKLISTBOX
 
 
 #if wxUSE_CHECKLISTBOX
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // wxCheckListBox
 
 //-----------------------------------------------------------------------------
 // wxCheckListBox


@@ -44,7 +44,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 
 bool wxCheckListBox::IsChecked( int index ) const
 {
 
 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)
 
     GList *child = g_list_nth( m_list->children, index );
     if (child)


@@ -54,16 +54,16 @@ bool wxCheckListBox::IsChecked( int index ) const
 
         wxString str = wxString(label->label,*wxConvCurrent);
 
 
         wxString str = wxString(label->label,*wxConvCurrent);
 

-        return (str[1] == _T('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 )
 {
     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)
 
     GList *child = g_list_nth( m_list->children, index );
     if (child)


@@ -73,19 +73,19 @@ void wxCheckListBox::Check( int index, bool check )
 
         wxString str = wxString(label->label,*wxConvCurrent);
 
 
         wxString str = wxString(label->label,*wxConvCurrent);
 

-        if (check == (str[1] == _T('X'))) return;
+        if (check == (str.GetChar(1) == wxT('X'))) return;

 
         if (check)
 
         if (check)

-            str.SetChar( 1, _T('X') );
+            str.SetChar( 1, wxT('X') );

         else
         else

-            str.SetChar( 1, _T('-') );
+            str.SetChar( 1, wxT('-') );

 
         gtk_label_set( label, str.mbc_str() );
 
         return;
     }
 
 
         gtk_label_set( label, str.mbc_str() );
 
         return;
     }
 

-    wxFAIL_MSG(_T("wrong checklistbox index"));
+    wxFAIL_MSG(wxT("wrong checklistbox index"));

 }
 
 int wxCheckListBox::GetItemHeight() const
 }
 
 int wxCheckListBox::GetItemHeight() const