Toolbars shouldn't have themed borders

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

diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index ba70c07e7f0af791fbde0118f989a11e3f1c9f31..1bfd53c2d97c39a6fe76dc68f9df248cc2b5fa13 100644 (file)
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -1,7 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

+// Modified by: Ryan Norton (Native GTK2.0+ checklist)

 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence


@@ -10,16 +11,36 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-

 #if wxUSE_CHECKLISTBOX
 
 #include "wx/checklst.h"
 #include "wx/gtk/private.h"
 #if wxUSE_CHECKLISTBOX
 
 #include "wx/checklst.h"
 #include "wx/gtk/private.h"

+#include "wx/gtk/treeentry_gtk.h"

 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 

+//-----------------------------------------------------------------------------
+// "toggled"
+//-----------------------------------------------------------------------------
+extern "C" {
+static void gtk_checklist_toggled(GtkCellRendererToggle *renderer,
+                                  gchar                 *stringpath,
+                                  wxCheckListBox        *listbox)
+{
+    wxCHECK_RET( listbox->m_treeview != NULL, wxT("invalid listbox") );
+
+    GtkTreePath* path = gtk_tree_path_new_from_string(stringpath);
+    wxCommandEvent new_event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED,
+                              listbox->GetId() );
+    new_event.SetEventObject( listbox );
+    new_event.SetInt( gtk_tree_path_get_indices(path)[0] );
+    gtk_tree_path_free(path);
+    listbox->Check( new_event.GetInt(), !listbox->IsChecked(new_event.GetInt()));
+    listbox->GetEventHandler()->ProcessEvent( new_event );
+}
+}
+

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


@@ -28,7 +49,7 @@ 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,


@@ -40,7 +61,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                                const wxValidator& validator,
                                const wxString& name )
 {
                                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 );
 }
 


@@ -52,59 +73,82 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                                const wxValidator& validator,
                                const wxString& name )
 {
                                const wxValidator& validator,
                                const wxString& name )
 {

-    m_hasCheckBoxes = TRUE;
+    m_hasCheckBoxes = true;

     wxListBox::Create( parent, id, pos, size, choices,
                        style, validator, name );
 }
 
     wxListBox::Create( parent, id, pos, size, choices,
                        style, validator, name );
 }
 

-bool wxCheckListBox::IsChecked( int index ) const
+void wxCheckListBox::DoCreateCheckList()

 {
 {

-    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 );
-
-        wxString str( wxGTK_CONV_BACK( label->label ) );
-
-        return str.GetChar(1) == wxCHECKLBOX_CHECKED;
-    }
-
-    wxFAIL_MSG(wxT("wrong checklistbox index"));
-    return FALSE;
+    //Create the checklist in our treeview and set up events for it
+    GtkCellRenderer* renderer =
+        gtk_cell_renderer_toggle_new();
+    GtkTreeViewColumn* column =
+        gtk_tree_view_column_new_with_attributes( "", renderer,
+                                                  "active", 0,
+                                                  NULL );
+    gtk_tree_view_column_set_fixed_width(column, 20);
+    gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
+    gtk_tree_view_column_set_clickable(column, TRUE);
+
+    g_signal_connect (renderer, "toggled",
+                      G_CALLBACK (gtk_checklist_toggled),
+                      this);
+
+    gtk_tree_view_append_column(m_treeview, column);

 }
 
 }
 

-void wxCheckListBox::Check( int index, bool check )
+bool wxCheckListBox::IsChecked(unsigned int index) const

 {
 {

-    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 );
-
-        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 ) );
+    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;
+
+    GValue value = {0, };
+    gtk_tree_model_get_value(GTK_TREE_MODEL(m_liststore),
+                             &iter,
+                             0, //column
+                             &value);
+
+    return g_value_get_boolean(&value) == TRUE ? true : false;
+}

 
 

+void wxCheckListBox::Check(unsigned int index, bool check)
+{
+    wxCHECK_RET( m_treeview != NULL, 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;
         return;

-    }

 
 

-    wxFAIL_MSG(wxT("wrong checklistbox index"));
+    gtk_list_store_set(m_liststore,
+                       &iter,
+                       0, //column
+                       check ? TRUE : FALSE, -1);

 }
 
 int wxCheckListBox::GetItemHeight() const
 {
 }
 
 int wxCheckListBox::GetItemHeight() const
 {

-    // FIXME
-    return 22;
+    wxCHECK_MSG( m_treeview != NULL, 0, wxT("invalid listbox"));
+
+    gint height;
+    gtk_tree_view_column_cell_get_size(
+        gtk_tree_view_get_column(m_treeview, 0),
+                                       NULL, NULL, NULL, NULL,
+                                       &height);
+    return height;

 }
 
 }
 

-#endif
+#endif //wxUSE_CHECKLISTBOX