Rename wxGenericImageList to wxImageList in generic wxListCtrl, too.

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

diff --git a/src/gtk1/checklst.cpp b/src/gtk1/checklst.cpp
index 3eaf62c54bcf9ac740a009e5abd6bdd20c292efb..01e3bc7c54aaedceae4a802dc927153852f24388 100644 (file)
--- a/src/gtk1/checklst.cpp
+++ b/src/gtk1/checklst.cpp
@@ -11,10 +11,14 @@
 #pragma implementation "checklst.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_CHECKLISTBOX
+
 #include "wx/checklst.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // wxCheckListBox
@@ -22,20 +26,19 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox,wxListBox)
 
-wxCheckListBox::wxCheckListBox() :
-   wxListBox()
+wxCheckListBox::wxCheckListBox() : wxListBox()
 {
     m_hasCheckBoxes = TRUE;
 }
 
 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 );
@@ -43,7 +46,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 
 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)
@@ -51,18 +54,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) == wxCHECKLBOX_CHECKED;
     }
 
-    wxFAIL_MSG("wrong checklistbox index");
+    wxFAIL_MSG(wxT("wrong checklistbox index"));
     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)
@@ -70,21 +73,19 @@ 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] == 'X')) return;
+        if (check == (str.GetChar(1) == wxCHECKLBOX_CHECKED))
+            return;
 
-        if (check)
-            str.SetChar( 1, 'X' );
-        else
-            str.SetChar( 1, '-' );
+        str.SetChar( 1, check ? wxCHECKLBOX_CHECKED : wxCHECKLBOX_UNCHECKED );
 
-        gtk_label_set( label, str );
+        gtk_label_set( label, str.mbc_str() );
 
         return;
     }
 
-    wxFAIL_MSG("wrong checklistbox index");
+    wxFAIL_MSG(wxT("wrong checklistbox index"));
 }
 
 int wxCheckListBox::GetItemHeight() const
@@ -92,3 +93,5 @@ int wxCheckListBox::GetItemHeight() const
     // FIXME
     return 22;
 }
+
+#endif