#include "wx/log.h"
#include "wx/dcclient.h"
#include "wx/sizer.h"
+ #include "wx/icon.h"
+ #include "wx/list.h"
+ #include "wx/settings.h"
+ #include "wx/crt.h"
#endif
#include "wx/stockitem.h"
#include "wx/calctrl.h"
#include "wx/popupwin.h"
-#include "wx/icon.h"
-#include "wx/list.h"
#include "wx/listimpl.cpp"
-#include "wx/settings.h"
#include "wx/gtk/private.h"
-#include "wx/gtk/win_gtk.h"
-
-#include <gobject/gvaluecollector.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
-#include <gtk/gtktreednd.h>
-
-#include <gdk/gdkkeysyms.h>
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataViewModel *wx_model, GtkWxTreeModel *owner );
~wxDataViewCtrlInternal();
+ GtkTreeModelFlags get_flags();
gboolean get_iter( GtkTreeIter *iter, GtkTreePath *path );
GtkTreePath *get_path( GtkTreeIter *iter);
gboolean iter_next( GtkTreeIter *iter );
static GtkTreeModelFlags
wxgtk_tree_model_get_flags (GtkTreeModel *tree_model)
{
- g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (tree_model), (GtkTreeModelFlags)0 );
+ GtkWxTreeModel *wxtree_model = (GtkWxTreeModel *) tree_model;
+ g_return_val_if_fail (GTK_IS_WX_TREE_MODEL (wxtree_model), (GtkTreeModelFlags)0 );
- return GTK_TREE_MODEL_ITERS_PERSIST;
+ return wxtree_model->internal->get_flags();
}
static gint
{
wxRect renderrect( rect.x, rect.y, rect.width, rect.height );
wxWindowDC* dc = (wxWindowDC*) cell->GetDC();
+#if wxUSE_NEW_DC
+ wxGTKWindowDCImpl *impldc = (wxGTKWindowDCImpl *) dc->GetImpl();
+ if (impldc->m_window == NULL)
+ {
+ impldc->m_window = window;
+ impldc->SetUpDC();
+ }
+#else
if (dc->m_window == NULL)
{
dc->m_window = window;
dc->SetUpDC();
}
+#endif
int state = 0;
if (flags & GTK_CELL_RENDERER_SELECTED)
g_value_unset( &gvalue );
}
+// ---------------------------------------------------------
+// wxDataViewTextRendererAttr
+// ---------------------------------------------------------
+
+IMPLEMENT_CLASS(wxDataViewTextRendererAttr,wxDataViewTextRenderer)
+
+wxDataViewTextRendererAttr::wxDataViewTextRendererAttr( const wxString &varianttype,
+ wxDataViewCellMode mode, int align ) :
+ wxDataViewTextRenderer( varianttype, mode, align )
+{
+}
+
// ---------------------------------------------------------
// wxDataViewBitmapRenderer
// ---------------------------------------------------------
public:
wxDataViewCtrlDC( wxDataViewCtrl *window )
{
+#if wxUSE_NEW_DC
+ wxGTKWindowDCImpl *impl = (wxGTKWindowDCImpl*) GetImpl();
+
+ GtkWidget *widget = window->m_treeview;
+ // Set later
+ impl->m_window = NULL;
+
+ impl->m_context = window->GtkGetPangoDefaultContext();
+ impl->m_layout = pango_layout_new( impl->m_context );
+ impl->m_fontdesc = pango_font_description_copy( widget->style->font_desc );
+
+ impl->m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget );
+
+#else
GtkWidget *widget = window->m_treeview;
// Set later
m_window = NULL;
m_fontdesc = pango_font_description_copy( widget->style->font_desc );
m_cmap = gtk_widget_get_colormap( widget ? widget : window->m_widget );
-
+#endif
// Set m_window later
// SetUpDC();
// m_owner = window;
wxDataViewModel *wx_model = tree_model->internal->GetDataViewModel();
+ if (!wx_model->IsIndexListModel())
+ {
+
if (wx_model->IsContainer( item ))
{
if (wx_model->HasContainerColumns( item ) || (cell->GetOwner()->GetModelColumn() == 0))
g_object_set_property( G_OBJECT(renderer), "visible", &gvalue );
g_value_unset( &gvalue );
}
+
+ }
wxVariant value;
wx_model->GetValue( value, item, cell->GetOwner()->GetModelColumn() );
cell->SetValue( value );
-#if 0
- wxListItemAttr attr;
- wx_model->GetAttr( item, attr, cell->GetOwner()->GetModelColumn() );
+ if (cell->GtkHasAttributes())
+ {
+ wxDataViewItemAttr attr;
+ bool colour_set = false;
+ bool style_set = false;
+ bool weight_set = false;
+
+ if (wx_model->GetAttr( item, cell->GetOwner()->GetModelColumn(), attr ))
+ {
+ // this must be a GtkCellRendererText
+ wxColour colour = attr.GetColour();
+ if (colour.IsOk())
+ {
+ const GdkColor * const gcol = colour.GetColor();
+ GValue gvalue = { 0, };
+ g_value_init( &gvalue, GDK_TYPE_COLOR );
+ g_value_set_boxed( &gvalue, gcol );
+ g_object_set_property( G_OBJECT(renderer), "foreground_gdk", &gvalue );
+ g_value_unset( &gvalue );
+
+ colour_set = true;
+ }
+
+ if (attr.GetItalic())
+ {
+ GValue gvalue = { 0, };
+ g_value_init( &gvalue, PANGO_TYPE_STYLE );
+ g_value_set_enum( &gvalue, PANGO_STYLE_ITALIC );
+ g_object_set_property( G_OBJECT(renderer), "style", &gvalue );
+ g_value_unset( &gvalue );
+
+ style_set = true;
+ }
+
+ if (attr.GetBold())
+ {
+ GValue gvalue = { 0, };
+ g_value_init( &gvalue, PANGO_TYPE_WEIGHT );
+ g_value_set_enum( &gvalue, PANGO_WEIGHT_BOLD );
+ g_object_set_property( G_OBJECT(renderer), "weight", &gvalue );
+ g_value_unset( &gvalue );
+
+ weight_set = true;
+ }
+ }
+
+ if (!style_set)
+ {
+ GValue gvalue = { 0, };
+ g_value_init( &gvalue, G_TYPE_BOOLEAN );
+ g_value_set_boolean( &gvalue, FALSE );
+ g_object_set_property( G_OBJECT(renderer), "style-set", &gvalue );
+ g_value_unset( &gvalue );
+ }
+
+ if (!weight_set)
+ {
+ GValue gvalue = { 0, };
+ g_value_init( &gvalue, G_TYPE_BOOLEAN );
+ g_value_set_boolean( &gvalue, FALSE );
+ g_object_set_property( G_OBJECT(renderer), "weight-set", &gvalue );
+ g_value_unset( &gvalue );
+ }
+
+ if (!colour_set)
+ {
+ GValue gvalue = { 0, };
+ g_value_init( &gvalue, G_TYPE_BOOLEAN );
+ g_value_set_boolean( &gvalue, FALSE );
+ g_object_set_property( G_OBJECT(renderer), "foreground-set", &gvalue );
+ g_value_unset( &gvalue );
+ }
+ }
+
+#if 0
if (attr.HasBackgroundColour())
{
wxColour colour = attr.GetBackgroundColour();
m_sort_order = GTK_SORT_ASCENDING;
m_sort_column = -1;
m_dataview_sort_column = NULL;
- InitTree();
+
+ if (!m_wx_model->IsIndexListModel())
+ InitTree();
}
wxDataViewCtrlInternal::~wxDataViewCtrlInternal()
void wxDataViewCtrlInternal::Resort()
{
- m_root->Resort();
+ if (!m_wx_model->IsIndexListModel())
+ m_root->Resort();
}
bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item )
{
- wxGtkTreeModelNode *parent_node = FindNode( parent );
- if (m_wx_model->IsContainer( item ))
- parent_node->AddNode( new wxGtkTreeModelNode( parent_node, item, this ) );
- else
- parent_node->AddLeave( item.GetID() );
+ if (!m_wx_model->IsIndexListModel())
+ {
+ wxGtkTreeModelNode *parent_node = FindNode( parent );
+ if (m_wx_model->IsContainer( item ))
+ parent_node->AddNode( new wxGtkTreeModelNode( parent_node, item, this ) );
+ else
+ parent_node->AddLeave( item.GetID() );
+ }
return true;
}
bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item )
{
- wxGtkTreeModelNode *parent_node = FindNode( parent );
- parent_node->DeleteChild( item.GetID() );
+ if (!m_wx_model->IsIndexListModel())
+ {
+ wxGtkTreeModelNode *parent_node = FindNode( parent );
+ parent_node->DeleteChild( item.GetID() );
+ }
return true;
}
return true;
}
+GtkTreeModelFlags wxDataViewCtrlInternal::get_flags()
+{
+ if (m_wx_model->IsIndexListModel())
+ return GTK_TREE_MODEL_LIST_ONLY;
+ else
+ return GTK_TREE_MODEL_ITERS_PERSIST;
+}
+
gboolean wxDataViewCtrlInternal::get_iter( GtkTreeIter *iter, GtkTreePath *path )
{
- int depth = gtk_tree_path_get_depth( path );
+ if (m_wx_model->IsIndexListModel())
+ {
+ wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
+
+ unsigned int i = (unsigned int)gtk_tree_path_get_indices (path)[0];
- wxGtkTreeModelNode *node = m_root;
+ if (i >= wx_model->GetLastIndex())
+ return FALSE;
+
+ iter->stamp = m_gtk_model->stamp;
+ // user_data is just the index
+ iter->user_data = (gpointer) i;
- int i;
- for (i = 0; i < depth; i++)
+ return TRUE;
+ }
+ else
{
- BuildBranch( node );
+ int depth = gtk_tree_path_get_depth( path );
+
+ wxGtkTreeModelNode *node = m_root;
+
+ int i;
+ for (i = 0; i < depth; i++)
+ {
+ BuildBranch( node );
- gint pos = gtk_tree_path_get_indices (path)[i];
- if (pos < 0) return FALSE;
- if ((size_t)pos >= node->GetChildCount()) return FALSE;
+ gint pos = gtk_tree_path_get_indices (path)[i];
+ if (pos < 0) return FALSE;
+ if ((size_t)pos >= node->GetChildCount()) return FALSE;
- void* id = node->GetChildren().Item( (size_t) pos );
+ void* id = node->GetChildren().Item( (size_t) pos );
- if (i == depth-1)
- {
- iter->stamp = m_gtk_model->stamp;
- iter->user_data = id;
- return TRUE;
- }
-
- size_t count = node->GetNodes().GetCount();
- size_t pos2;
- for (pos2 = 0; pos2 < count; pos2++)
- {
- wxGtkTreeModelNode *child_node = node->GetNodes().Item( pos2 );
- if (child_node->GetItem().GetID() == id)
+ if (i == depth-1)
{
- node = child_node;
- break;
+ iter->stamp = m_gtk_model->stamp;
+ iter->user_data = id;
+ return TRUE;
}
- }
+
+ size_t count = node->GetNodes().GetCount();
+ size_t pos2;
+ for (pos2 = 0; pos2 < count; pos2++)
+ {
+ wxGtkTreeModelNode *child_node = node->GetNodes().Item( pos2 );
+ if (child_node->GetItem().GetID() == id)
+ {
+ node = child_node;
+ break;
+ }
+ }
+ }
}
return FALSE;
GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter )
{
GtkTreePath *retval = gtk_tree_path_new ();
- void *id = iter->user_data;
- wxGtkTreeModelNode *node = FindParentNode( iter );
- while (node)
+ if (m_wx_model->IsIndexListModel())
{
- int pos = node->GetChildren().Index( id );
+ // user_data is just the index
+ int i = (wxUIntPtr) iter->user_data;
+ gtk_tree_path_append_index (retval, i);
+ }
+ else
+ {
+ void *id = iter->user_data;
+
+ wxGtkTreeModelNode *node = FindParentNode( iter );
+ while (node)
+ {
+ int pos = node->GetChildren().Index( id );
- gtk_tree_path_prepend_index( retval, pos );
+ gtk_tree_path_prepend_index( retval, pos );
- id = node->GetItem().GetID();
- node = node->GetParent();
+ id = node->GetItem().GetID();
+ node = node->GetParent();
+ }
}
-
+
return retval;
}
gboolean wxDataViewCtrlInternal::iter_next( GtkTreeIter *iter )
{
- wxGtkTreeModelNode *parent = FindParentNode( iter );
- if( parent == NULL )
- return FALSE;
+ if (m_wx_model->IsIndexListModel())
+ {
+ wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
+
+ int n = (wxUIntPtr) iter->user_data;
- int pos = parent->GetChildren().Index( iter->user_data );
+ if (n == -1)
+ return FALSE;
- if (pos == (int) parent->GetChildCount()-1)
- return FALSE;
+ if (n >= (int) wx_model->GetLastIndex()-2)
+ return FALSE;
+
+ iter->user_data = (gpointer) ++n;
+ }
+ else
+ {
+ wxGtkTreeModelNode *parent = FindParentNode( iter );
+ if( parent == NULL )
+ return FALSE;
+
+ int pos = parent->GetChildren().Index( iter->user_data );
+
+ if (pos == (int) parent->GetChildCount()-1)
+ return FALSE;
- iter->stamp = m_gtk_model->stamp;
- iter->user_data = parent->GetChildren().Item( pos+1 );
+ iter->stamp = m_gtk_model->stamp;
+ iter->user_data = parent->GetChildren().Item( pos+1 );
+ }
return TRUE;
}
gboolean wxDataViewCtrlInternal::iter_children( GtkTreeIter *iter, GtkTreeIter *parent )
{
- wxDataViewItem item( (void*) parent->user_data );
+ if (m_wx_model->IsIndexListModel())
+ {
+ // this is a list, nodes have no children
+ if (parent)
+ return FALSE;
+
+ iter->stamp = m_gtk_model->stamp;
+ iter->user_data = (gpointer) -1;
+
+ return TRUE;
+ }
+ else
+ {
+ wxDataViewItem item( (void*) parent->user_data );
- if (!m_wx_model->IsContainer( item ))
- return FALSE;
+ if (!m_wx_model->IsContainer( item ))
+ return FALSE;
- wxGtkTreeModelNode *parent_node = FindNode( parent );
- BuildBranch( parent_node );
+ wxGtkTreeModelNode *parent_node = FindNode( parent );
+ BuildBranch( parent_node );
- if (parent_node->GetChildCount() == 0)
- return FALSE;
+ if (parent_node->GetChildCount() == 0)
+ return FALSE;
- iter->stamp = m_gtk_model->stamp;
- iter->user_data = (gpointer) parent_node->GetChildren().Item( 0 );
-
+ iter->stamp = m_gtk_model->stamp;
+ iter->user_data = (gpointer) parent_node->GetChildren().Item( 0 );
+ }
+
return TRUE;
}
gboolean wxDataViewCtrlInternal::iter_has_child( GtkTreeIter *iter )
{
- wxDataViewItem item( (void*) iter->user_data );
+ if (m_wx_model->IsIndexListModel())
+ {
+ // this is a list, nodes have no children
+ return FALSE;
+ }
+ else
+ {
+ wxDataViewItem item( (void*) iter->user_data );
- bool is_container = m_wx_model->IsContainer( item );
+ bool is_container = m_wx_model->IsContainer( item );
- if (!is_container)
- return FALSE;
+ if (!is_container)
+ return FALSE;
- wxGtkTreeModelNode *node = FindNode( iter );
- BuildBranch( node );
+ wxGtkTreeModelNode *node = FindNode( iter );
+ BuildBranch( node );
- return (node->GetChildCount() > 0);
+ return (node->GetChildCount() > 0);
+ }
}
gint wxDataViewCtrlInternal::iter_n_children( GtkTreeIter *iter )
{
- wxDataViewItem item( (void*) iter->user_data );
-
- if (!m_wx_model->IsContainer( item ))
+ if (m_wx_model->IsIndexListModel())
+ {
+ wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
+
+ if (iter == NULL)
+ return (gint) wx_model->GetLastIndex()-1;
+
return 0;
+ }
+ else
+ {
+ wxDataViewItem item( (void*) iter->user_data );
- wxGtkTreeModelNode *parent_node = FindNode( iter );
- BuildBranch( parent_node );
+ if (!m_wx_model->IsContainer( item ))
+ return 0;
+
+ wxGtkTreeModelNode *parent_node = FindNode( iter );
+ BuildBranch( parent_node );
- // wxPrintf( "iter_n_children %d\n", parent_node->GetChildCount() );
+ // wxPrintf( "iter_n_children %d\n", parent_node->GetChildCount() );
- return parent_node->GetChildCount();
+ return parent_node->GetChildCount();
+ }
}
gboolean wxDataViewCtrlInternal::iter_nth_child( GtkTreeIter *iter, GtkTreeIter *parent, gint n )
{
- void* id = NULL;
- if (parent) id = (void*) parent->user_data;
- wxDataViewItem item( id );
+ if (m_wx_model->IsIndexListModel())
+ {
+ wxDataViewIndexListModel *wx_model = (wxDataViewIndexListModel*) m_wx_model;
+
+ if (parent)
+ return FALSE;
+
+ if (n < 0)
+ return FALSE;
+
+ if (n >= (gint) wx_model->GetLastIndex()-1)
+ return FALSE;
+
+ iter->stamp = m_gtk_model->stamp;
+ iter->user_data = (gpointer) n;
+
+ return TRUE;
+ }
+ else
+ {
+ void* id = NULL;
+ if (parent) id = (void*) parent->user_data;
+ wxDataViewItem item( id );
- if (!m_wx_model->IsContainer( item ))
- return FALSE;
+ if (!m_wx_model->IsContainer( item ))
+ return FALSE;
- wxGtkTreeModelNode *parent_node = FindNode( parent );
- BuildBranch( parent_node );
+ wxGtkTreeModelNode *parent_node = FindNode( parent );
+ BuildBranch( parent_node );
- // wxPrintf( "iter_nth_child %d\n", n );
+ // wxPrintf( "iter_nth_child %d\n", n );
- iter->stamp = m_gtk_model->stamp;
- iter->user_data = parent_node->GetChildren().Item( n );
+ iter->stamp = m_gtk_model->stamp;
+ iter->user_data = parent_node->GetChildren().Item( n );
- return TRUE;
+ return TRUE;
+ }
}
gboolean wxDataViewCtrlInternal::iter_parent( GtkTreeIter *iter, GtkTreeIter *child )
{
- wxGtkTreeModelNode *node = FindParentNode( child );
- if (!node)
+ if (m_wx_model->IsIndexListModel())
+ {
return FALSE;
+ }
+ else
+ {
+ wxGtkTreeModelNode *node = FindParentNode( child );
+ if (!node)
+ return FALSE;
- iter->stamp = m_gtk_model->stamp;
- iter->user_data = (gpointer) node->GetItem().GetID();
+ iter->stamp = m_gtk_model->stamp;
+ iter->user_data = (gpointer) node->GetItem().GetID();
- return TRUE;
+ return TRUE;
+ }
}
static wxGtkTreeModelNode*
projects / wxWidgets.git / blobdiff