callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk/gtktreeviewcolumn.c: use accessor functions to access GtkWidget

Browse Source
This commit is contained in:
Javier Jardón
2010-08-11 22:50:01 +02:00
parent a44969e877
commit 1c6b3f53a0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtktreeviewcolumn.c
View File

@ -1265,6 +1265,7 @@ gtk_tree_view_column_setup_sort_column_id_callback (GtkTreeViewColumn *tree_colu
void void
_gtk_tree_view_column_realize_button (GtkTreeViewColumn *column) _gtk_tree_view_column_realize_button (GtkTreeViewColumn *column)
{ {
GtkAllocation allocation;
GtkTreeView *tree_view; GtkTreeView *tree_view;
GdkWindowAttr attr; GdkWindowAttr attr;
guint attributes_mask; guint attributes_mask;
@ -1300,7 +1301,8 @@ _gtk_tree_view_column_realize_button (GtkTreeViewColumn *column)
attr.width = TREE_VIEW_DRAG_WIDTH; attr.width = TREE_VIEW_DRAG_WIDTH;
attr.height = tree_view->priv->header_height; attr.height = tree_view->priv->header_height;
attr.x = (column->button->allocation.x + (rtl ? 0 : column->button->allocation.width)) - TREE_VIEW_DRAG_WIDTH / 2; gtk_widget_get_allocation (column->button, &allocation);
attr.x = (allocation.x + (rtl ? 0 : allocation.width)) - TREE_VIEW_DRAG_WIDTH / 2;
column->window = gdk_window_new (tree_view->priv->header_window, column->window = gdk_window_new (tree_view->priv->header_window,
&attr, attributes_mask); &attr, attributes_mask);
gdk_window_set_user_data (column->window, tree_view); gdk_window_set_user_data (column->window, tree_view);
@ -3505,7 +3507,7 @@ _gtk_tree_view_column_cell_draw_focus (GtkTreeViewColumn *tree_column,
cell_state = flags & GTK_CELL_RENDERER_SELECTED ? GTK_STATE_SELECTED : cell_state = flags & GTK_CELL_RENDERER_SELECTED ? GTK_STATE_SELECTED :
(flags & GTK_CELL_RENDERER_PRELIT ? GTK_STATE_PRELIGHT : (flags & GTK_CELL_RENDERER_PRELIT ? GTK_STATE_PRELIGHT :
(flags & GTK_CELL_RENDERER_INSENSITIVE ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL)); (flags & GTK_CELL_RENDERER_INSENSITIVE ? GTK_STATE_INSENSITIVE : GTK_STATE_NORMAL));
gtk_paint_focus (tree_column->tree_view->style, gtk_paint_focus (gtk_widget_get_style (tree_column->tree_view),
window, window,
cell_state, cell_state,
cell_area, cell_area,