wxChoiceDialog fix.

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

diff --git a/src/gtk1/checklst.cpp b/src/gtk1/checklst.cpp
index fc439b68de6d4e7c07cdb599aaadcde3d75c213c..6c08581ae66b745e3270bcbd8d3cbfe344a15731 100644 (file)
--- a/src/gtk1/checklst.cpp
+++ b/src/gtk1/checklst.cpp
@@ -13,6 +13,8 @@
 
 #include "wx/checklst.h"
 
 
 #include "wx/checklst.h"
 

+#if wxUSE_CHECKLISTBOX
+

 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 


@@ -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;
 }


@@ -51,9 +52,9 @@ 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,*wxConv_current);

 
 

-        return (str[1] == 'X');
+        return (str[1] == _T('X'));

     }
 
     wxFAIL_MSG(_T("wrong checklistbox index"));
     }
 
     wxFAIL_MSG(_T("wrong checklistbox index"));


@@ -70,7 +71,7 @@ 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] == _T('X'))) return;
 
 
         if (check == (str[1] == _T('X'))) return;
 


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

+
+#endif