Fix deprecating warning introduced in r72446.

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

diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index 169e56785b24b63d70af67d6abc780a1c7fce70c..e0826434223d6af71ef447fd0e04eee0fd5e8974 100644 (file)
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -23,9 +23,8 @@
 //-----------------------------------------------------------------------------
 // "toggled"
 //-----------------------------------------------------------------------------
-#if wxUSE_NATIVEGTKCHECKLIST
 extern "C" {
-static void gtk_checklist_toggled(GtkCellRendererToggle *renderer,
+static void gtk_checklist_toggled(GtkCellRendererToggle * WXUNUSED(renderer),
                                   gchar                 *stringpath,
                                   wxCheckListBox        *listbox)
 {
@@ -36,19 +35,17 @@ static void gtk_checklist_toggled(GtkCellRendererToggle *renderer,
                               listbox->GetId() );
     new_event.SetEventObject( listbox );
     new_event.SetInt( gtk_tree_path_get_indices(path)[0] );
+    new_event.SetString( listbox->GetString( new_event.GetInt() ));
     gtk_tree_path_free(path);
     listbox->Check( new_event.GetInt(), !listbox->IsChecked(new_event.GetInt()));
-    listbox->GetEventHandler()->ProcessEvent( new_event );
+    listbox->HandleWindowEvent( new_event );
 }
 }
-#endif
 
 //-----------------------------------------------------------------------------
 // wxCheckListBox
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox,wxListBox)
-
 wxCheckListBox::wxCheckListBox() : wxListBox()
 {
     m_hasCheckBoxes = true;
@@ -80,7 +77,6 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                        style, validator, name );
 }
 
-#if wxUSE_NATIVEGTKCHECKLIST
 void wxCheckListBox::DoCreateCheckList()
 {
     //Create the checklist in our treeview and set up events for it
@@ -90,7 +86,12 @@ void wxCheckListBox::DoCreateCheckList()
         gtk_tree_view_column_new_with_attributes( "", renderer,
                                                   "active", 0,
                                                   NULL );
-    gtk_tree_view_column_set_fixed_width(column, 20);
+#if wxUSE_LIBHILDON2
+    gtk_tree_view_column_set_fixed_width(column, 40);
+#else
+    gtk_tree_view_column_set_fixed_width(column, 22);
+#endif // wxUSE_LIBHILDON2/!wxUSE_LIBHILDON2
+
     gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
     gtk_tree_view_column_set_clickable(column, TRUE);
 
@@ -101,16 +102,16 @@ void wxCheckListBox::DoCreateCheckList()
     gtk_tree_view_append_column(m_treeview, column);
 }
 
-bool wxCheckListBox::IsChecked( int index ) const
+bool wxCheckListBox::IsChecked(unsigned int index) const
 {
-    wxCHECK_MSG( m_treeview != NULL, FALSE, wxT("invalid checklistbox") );
+    wxCHECK_MSG( m_treeview != NULL, false, wxT("invalid checklistbox") );
 
     GtkTreeIter iter;
     gboolean res = gtk_tree_model_iter_nth_child(
                         GTK_TREE_MODEL(m_liststore),
                         &iter, NULL, //NULL = parent = get first
                         index
-                                                );
+                   );
     if(!res)
         return false;
 
@@ -120,10 +121,10 @@ bool wxCheckListBox::IsChecked( int index ) const
                              0, //column
                              &value);
 
-    return g_value_get_boolean(&value) == TRUE ? true : false;
+    return g_value_get_boolean(&value) != 0;
 }
 
-void wxCheckListBox::Check( int index, bool check )
+void wxCheckListBox::Check(unsigned int index, bool check)
 {
     wxCHECK_RET( m_treeview != NULL, wxT("invalid checklistbox") );
 
@@ -132,7 +133,7 @@ void wxCheckListBox::Check( int index, bool check )
                         GTK_TREE_MODEL(m_liststore),
                         &iter, NULL, //NULL = parent = get first
                         index
-                                                );
+                   );
     if(!res)
         return;
 
@@ -154,52 +155,4 @@ int wxCheckListBox::GetItemHeight() const
     return height;
 }
 
-#else //NON-NATIVE
-
-bool wxCheckListBox::IsChecked( int index ) const
-{
-    wxCHECK_MSG( m_treeview != NULL, false, wxT("invalid checklistbox") );
-
-    GtkTreeEntry* entry = GtkGetEntry(index);
-    if (entry)
-    {
-        wxString str( wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) ) );
-
-        return str.GetChar(1) == wxCHECKLBOX_CHECKED;
-    }
-
-    wxFAIL_MSG(wxT("wrong checklistbox index"));
-    return false;
-}
-
-void wxCheckListBox::Check( int index, bool check )
-{
-    wxCHECK_RET( m_treeview != NULL, wxT("invalid checklistbox") );
-
-    GtkTreeEntry* entry = GtkGetEntry(index);
-    if (entry)
-    {
-        wxString str( wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) ) );
-
-        if (check == (str.GetChar(1) == wxCHECKLBOX_CHECKED))
-            return;
-
-        str.SetChar( 1, check ? wxCHECKLBOX_CHECKED : wxCHECKLBOX_UNCHECKED );
-
-        gtk_tree_entry_set_label( entry, wxGTK_CONV( str ) );
-
-        return;
-    }
-
-    wxFAIL_MSG(wxT("wrong checklistbox index"));
-}
-
-int wxCheckListBox::GetItemHeight() const
-{
-    // FIXME
-    return 22;
-}
-
-#endif //wxUSE_NATIVEGTKCHECKLIST
-
 #endif //wxUSE_CHECKLISTBOX