removed incorrect param from docs

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

diff --git a/src/gtk1/checklst.cpp b/src/gtk1/checklst.cpp
index e47e7bd8054147c25ddf5c11b5589e5a1a528157..03909142071d7529a9f627fe008c1f78dde0aa17 100644 (file)
--- a/src/gtk1/checklst.cpp
+++ b/src/gtk1/checklst.cpp
@@ -13,8 +13,10 @@
 
 #include "wx/checklst.h"
 
 
 #include "wx/checklst.h"
 

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

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


@@ -22,8 +24,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox,wxListBox)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox,wxListBox)
 

-wxCheckListBox::wxCheckListBox() :
-   wxListBox()
+wxCheckListBox::wxCheckListBox() : wxListBox()

 {
     m_hasCheckBoxes = TRUE;
 }
 {
     m_hasCheckBoxes = TRUE;
 }


@@ -43,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, "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)


@@ -51,18 +52,18 @@ bool wxCheckListBox::IsChecked( int index ) const
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
         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("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, "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)


@@ -70,21 +71,21 @@ void wxCheckListBox::Check( int index, bool check )
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
         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] == 'X')) return;
+        if (check == (str.GetChar(1) == wxT('X'))) return;

 
         if (check)
 
         if (check)

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

         else
         else

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

 
 

-        gtk_label_set( label, str );
+        gtk_label_set( label, str.mbc_str() );

 
         return;
     }
 
 
         return;
     }
 

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

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


@@ -92,3 +93,5 @@ int wxCheckListBox::GetItemHeight() const
     // FIXME
     return 22;
 }
     // FIXME
     return 22;
 }

+
+#endif