Committing in .

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

diff --git a/src/gtk1/checklst.cpp b/src/gtk1/checklst.cpp
index 82fb96dc1a419b24100cf89fa17acc2e2ba17873..03909142071d7529a9f627fe008c1f78dde0aa17 100644 (file)
--- a/src/gtk1/checklst.cpp
+++ b/src/gtk1/checklst.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -13,8 +13,10 @@
 
 #include "wx/checklst.h"
 
 
 #include "wx/checklst.h"
 

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

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


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


@@ -32,7 +33,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                  const wxPoint& pos,
                  const wxSize& size,
                  int nStrings, 
                  const wxPoint& pos,
                  const wxSize& size,
                  int nStrings, 

-                 const wxString choices[],
+                 const wxString *choices,

                  long style,
                  const wxValidator& validator,
                  const wxString& name )
                  long style,
                  const wxValidator& validator,
                  const wxString& name )


@@ -43,51 +44,54 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 
 bool wxCheckListBox::IsChecked( int index ) const
 {
 
 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)
     {
         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 = wxString(label->label,*wxConvCurrent);
+
+        return (str.GetChar(1) == wxT('X'));

     }
     }

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

     return FALSE;
 }
 
 void wxCheckListBox::Check( int index, bool check )
 {
     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)
     {
         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 = wxString(label->label,*wxConvCurrent);
+
+        if (check == (str.GetChar(1) == wxT('X'))) return;
+
+        if (check)
+            str.SetChar( 1, wxT('X') );
+        else
+            str.SetChar( 1, wxT('-') );
+
+        gtk_label_set( label, str.mbc_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