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 1a092196ec94e22d62dae7772b85d80090109d6e..cb46643608f8ed70f7f55c9c20118caeeb61e433 100644 (file)
--- a/src/gtk1/checklst.cpp
+++ b/src/gtk1/checklst.cpp
@@ -1,20 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        checklst.cpp
+// Name:        src/gtk1/checklst.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// 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/checklst.h"

+#include "wx/gtk1/private.h"

 
 

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

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


@@ -22,71 +24,85 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox,wxListBox)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox,wxListBox)
 

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

 {
 {

-    m_hasCheckBoxes = TRUE;
+    m_hasCheckBoxes = true;

 }
 }

+

 wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,

-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 int nStrings = 0, 
-                 const wxString choices[] = NULL,
-                 long style = 0,
-                 const wxValidator& validator = wxDefaultValidator,
-                 const wxString& name = wxListBoxNameStr)
+                               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 );
 }
 
     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)
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
     GList *child = g_list_nth( m_list->children, index );
     if (child)
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );

-       
-       wxString str = label->label;
-    
-        return (str[1] == 'X');
+
+        wxString str( wxGTK_CONV_BACK( label->label ) );
+
+        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)
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
     GList *child = g_list_nth( m_list->children, index );
     if (child)
     {
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );

-       
-       wxString str = label->label;
-    
-        if (check == (str[1] == 'X')) return;
-       
-       if (check)
-           str.SetChar( 1, 'X' );
-       else
-           str.SetChar( 1, '-' );
-           
-       gtk_label_set( label, str );
-           
-       return;
+
+        wxString str( wxGTK_CONV_BACK( label->label ) );
+
+        if (check == (str.GetChar(1) == wxCHECKLBOX_CHECKED))
+            return;
+
+        str.SetChar( 1, check ? wxCHECKLBOX_CHECKED : wxCHECKLBOX_UNCHECKED );
+
+        gtk_label_set( label, wxGTK_CONV( str ) );
+
+        return;

     }
     }

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

 }
 
 }
 

-int wxCheckListBox::GetItemHeight()
+int wxCheckListBox::GetItemHeight() const

 {
 {

+    // FIXME

     return 22;
 }
     return 22;
 }

+
+#endif