Remove apparently erroneous -1 from DrawBitmap() in wxMSW wxGC code.

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

diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index 252e216983b51b24c3922efd7aba3f4e49991f75..a75aebf608ef942e4e12dea3f0be8ebe25e4ac62 100644 (file)
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -1,85 +1,158 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // 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/gtk/private.h"
+#include "wx/gtk/treeentry_gtk.h"
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxCheckListBox
+// "toggled"

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

+extern "C" {
+static void gtk_checklist_toggled(GtkCellRendererToggle * WXUNUSED(renderer),
+                                  gchar                 *stringpath,
+                                  wxCheckListBox        *listbox)
+{
+    wxCHECK_RET( listbox->m_treeview != NULL, wxT("invalid listbox") );

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox,wxListBox)
+    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] );
+    new_event.SetString( listbox->GetString( new_event.GetInt() ));
+    gtk_tree_path_free(path);
+    listbox->Check( new_event.GetInt(), !listbox->IsChecked(new_event.GetInt()));
+    listbox->HandleWindowEvent( new_event );
+}
+}

 
 

-wxCheckListBox::wxCheckListBox() :
-   wxListBox()
+//-----------------------------------------------------------------------------
+// wxCheckListBox
+//-----------------------------------------------------------------------------
+
+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 );
+}
+
+void wxCheckListBox::DoCreateCheckList()

 {
 {

-    wxCHECK_MSG( m_list != NULL, FALSE, "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 = label->label;
-    
-        return (str[1] == 'X');
-    }
-    
-    wxFAIL_MSG("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 );
+#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);
+
+    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, "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 = label->label;
-    
-        if (check == (str[1] == 'X')) return;
-       
-       if (check)
-           str.SetChar( 1, 'X' );
-       else
-           str.SetChar( 1, '-' );
-           
-       gtk_label_set( label, str );
-           
-       return;
-    }
-    
-    wxFAIL_MSG("wrong checklistbox index");
+    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;
+
+    gtk_list_store_set(m_liststore,
+                       &iter,
+                       0, //column
+                       check ? TRUE : FALSE, -1);
+}
+
+int wxCheckListBox::GetItemHeight() const
+{
+    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 //wxUSE_CHECKLISTBOX