use WX_DEFINE_ARRAY_INT for an array of ints (bug 1536482)

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

diff --git a/src/gtk1/checklst.cpp b/src/gtk1/checklst.cpp
index e47e7bd8054147c25ddf5c11b5589e5a1a528157..cb46643608f8ed70f7f55c9c20118caeeb61e433 100644 (file)
--- a/src/gtk1/checklst.cpp
+++ b/src/gtk1/checklst.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        checklst.cpp
+// Name:        src/gtk1/checklst.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,14 +7,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "checklst.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_CHECKLISTBOX
 
 #include "wx/checklst.h"
+#include "wx/gtk1/private.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // wxCheckListBox
@@ -22,28 +24,40 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox,wxListBox)
 
-wxCheckListBox::wxCheckListBox() :
-   wxListBox()
+wxCheckListBox::wxCheckListBox() : wxListBox()
 {
-    m_hasCheckBoxes = TRUE;
+    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;
+    m_hasCheckBoxes = true;
     wxListBox::Create( parent, id, pos, size, nStrings, choices, style, validator, name );
 }
 
-bool wxCheckListBox::IsChecked( int index ) const
+wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
+                               const wxPoint& pos,
+                               const wxSize& size,
+                               const wxArrayString& choices,
+                               long style,
+                               const wxValidator& validator,
+                               const wxString& name )
+{
+    m_hasCheckBoxes = true;
+    wxListBox::Create( parent, id, pos, size, choices,
+                       style, validator, name );
+}
+
+bool wxCheckListBox::IsChecked(unsigned 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 +65,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( wxGTK_CONV_BACK( label->label ) );
 
-        return (str[1] == 'X');
+        return str.GetChar(1) == wxCHECKLBOX_CHECKED;
     }
 
-    wxFAIL_MSG("wrong checklistbox index");
-    return FALSE;
+    wxFAIL_MSG(wxT("wrong checklistbox index"));
+    return false;
 }
 
-void wxCheckListBox::Check( int index, bool check )
+void wxCheckListBox::Check(unsigned 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 +84,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( wxGTK_CONV_BACK( label->label ) );
 
-        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, wxGTK_CONV( str ) );
 
         return;
     }
 
-    wxFAIL_MSG("wrong checklistbox index");
+    wxFAIL_MSG(wxT("wrong checklistbox index"));
 }
 
 int wxCheckListBox::GetItemHeight() const
@@ -92,3 +104,5 @@ int wxCheckListBox::GetItemHeight() const
     // FIXME
     return 22;
 }
+
+#endif