Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied Ryan's native wxListBox and wxCheckListBox patch

Browse Source 
in slightly modified form..


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-03-01 21:51:42 +00:00
parent 4eccd3a10f
commit 4a46cbe8c6
8 changed files with 1167 additions and 796 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
src/gtk/checklst.cpp
View File

@@ -2,6 +2,7 @@
// Name: checklst.cpp
// Purpose:
// Author: Robert Roebling
// Modified by: Ryan Norton (Native GTK2.0+ checklist)
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
@@ -15,17 +16,35 @@
#if wxUSE_CHECKLISTBOX
#include "wx/checklst.h"
// FIXME: We use GtkList to implement wxListBox
#ifdef GTK_DISABLE_DEPRECATED
#undef GTK_DISABLE_DEPRECATED
#endif
#include "wx/gtk/private.h"
#include "wx/gtk/treeentry_gtk.h"
#include <gdk/gdk.h>
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// "toggled"
//-----------------------------------------------------------------------------
#if wxUSE_NATIVEGTKCHECKLIST
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 );
}
}
#endif
//-----------------------------------------------------------------------------
// wxCheckListBox
//-----------------------------------------------------------------------------
@@ -63,17 +82,90 @@ 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
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);
}
bool wxCheckListBox::IsChecked( int index ) const
{
wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid checklistbox") );
wxCHECK_MSG( m_treeview != NULL, FALSE, wxT("invalid checklistbox") );
GList *child = g_list_nth( m_list->children, index );
if (child)
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( 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;
}
#else //NON-NATIVE
bool wxCheckListBox::IsChecked( int index ) const
{
wxCHECK_MSG( m_treeview != NULL, FALSE, wxT("invalid checklistbox") );
GtkTreeEntry* entry = GtkGetEntry(index);
if (entry)
{
GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child );
wxString str( wxGTK_CONV_BACK( label->label ) );
wxString str( wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) ) );
return str.GetChar(1) == wxCHECKLBOX_CHECKED;
}
@@ -84,22 +176,19 @@ bool wxCheckListBox::IsChecked( int index ) const
void wxCheckListBox::Check( int index, bool check )
{
wxCHECK_RET( m_list != NULL, wxT("invalid checklistbox") );
wxCHECK_RET( m_treeview != NULL, wxT("invalid checklistbox") );
GList *child = g_list_nth( m_list->children, index );
if (child)
GtkTreeEntry* entry = GtkGetEntry(index);
if (entry)
{
GtkBin *bin = GTK_BIN( child->data );
GtkLabel *label = GTK_LABEL( bin->child );
wxString str( wxGTK_CONV_BACK( label->label ) );
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_label_set_text( label, wxGTK_CONV( str ) );
gtk_tree_entry_set_label( entry, wxGTK_CONV( str ) );
return;
}
@@ -113,4 +202,6 @@ int wxCheckListBox::GetItemHeight() const
return 22;
}
#endif
#endif //wxUSE_NATIVEGTKCHECKLIST
#endif //wxUSE_CHECKLISTBOX