X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..e6f466082e3652bd4c84b11aa933a52b4e54dbf0:/src/gtk1/checklst.cpp

diff --git a/src/gtk1/checklst.cpp b/src/gtk1/checklst.cpp
index de5d961859..cb46643608 100644
--- 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,16 +7,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "checklst.h"
-#endif
-
-#include "wx/checklst.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_CHECKLISTBOX
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/checklst.h"
+#include "wx/gtk1/private.h"
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // wxCheckListBox
@@ -26,25 +26,38 @@ IMPLEMENT_DYNAMIC_CLASS(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, wxT("invalid checklistbox") );
+    wxCHECK_MSG( m_list != NULL, false, wxT("invalid checklistbox") );
 
     GList *child = g_list_nth( m_list->children, index );
     if (child)
@@ -52,16 +65,16 @@ bool wxCheckListBox::IsChecked( int index ) const
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
-        wxString str = wxString(label->label,*wxConvCurrent);
+        wxString str( wxGTK_CONV_BACK( label->label ) );
 
-        return (str[1] == wxT('X'));
+        return str.GetChar(1) == wxCHECKLBOX_CHECKED;
     }
 
     wxFAIL_MSG(wxT("wrong checklistbox index"));
-    return FALSE;
+    return false;
 }
 
-void wxCheckListBox::Check( int index, bool check )
+void wxCheckListBox::Check(unsigned int index, bool check )
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid checklistbox") );
 
@@ -71,16 +84,14 @@ void wxCheckListBox::Check( int index, bool check )
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
-        wxString str = wxString(label->label,*wxConvCurrent);
+        wxString str( wxGTK_CONV_BACK( label->label ) );
 
-        if (check == (str[1] == wxT('X'))) return;
+        if (check == (str.GetChar(1) == wxCHECKLBOX_CHECKED))
+            return;
 
-        if (check)
-            str.SetChar( 1, wxT('X') );
-        else
-            str.SetChar( 1, wxT('-') );
+        str.SetChar( 1, check ? wxCHECKLBOX_CHECKED : wxCHECKLBOX_UNCHECKED );
 
-        gtk_label_set( label, str.mbc_str() );
+        gtk_label_set( label, wxGTK_CONV( str ) );
 
         return;
     }