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

tree view: Fix compiler warnings

Browse Source 
Fix warnings due to -Wdeclaration-after-statement and -Wshadow.
This commit is contained in:
Matthias Clasen
2015-05-30 21:29:48 -04:00
parent 3dd7f12f78
commit 121c195521
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtktreeselection.c
View File

@ -582,8 +582,6 @@ gtk_tree_selection_get_selected_rows (GtkTreeSelection *selection,
if (gtk_tree_selection_get_selected (selection, NULL, &iter)) if (gtk_tree_selection_get_selected (selection, NULL, &iter))
{ {
GtkTreePath *path;
path = gtk_tree_model_get_path (gtk_tree_view_get_model (priv->tree_view), &iter); path = gtk_tree_model_get_path (gtk_tree_view_get_model (priv->tree_view), &iter);
list = g_list_append (list, path); list = g_list_append (list, path);

30
gtk/gtktreeview.c
View File

@ -2959,19 +2959,19 @@ gtk_tree_view_size_allocate (GtkWidget *widget,
for (tmp_list = tree_view->priv->children; tmp_list; tmp_list = tmp_list->next) for (tmp_list = tree_view->priv->children; tmp_list; tmp_list = tmp_list->next)
{ {
GtkTreeViewChild *child = tmp_list->data; GtkTreeViewChild *child = tmp_list->data;
GtkAllocation allocation; GtkAllocation child_allocation;
GtkTreePath *path; GtkTreePath *path;
GdkRectangle rect; GdkRectangle rect;
/* totally ignore our child's requisition */ /* totally ignore our child's requisition */
path = _gtk_tree_path_new_from_rbtree (child->tree, child->node); path = _gtk_tree_path_new_from_rbtree (child->tree, child->node);
gtk_tree_view_get_cell_area (tree_view, path, child->column, &rect); gtk_tree_view_get_cell_area (tree_view, path, child->column, &rect);
allocation.x = rect.x + child->border.left; child_allocation.x = rect.x + child->border.left;
allocation.y = rect.y + child->border.top; child_allocation.y = rect.y + child->border.top;
allocation.width = rect.width - (child->border.left + child->border.right); child_allocation.width = rect.width - (child->border.left + child->border.right);
allocation.height = rect.height - (child->border.top + child->border.bottom); child_allocation.height = rect.height - (child->border.top + child->border.bottom);
gtk_tree_path_free (path); gtk_tree_path_free (path);
gtk_widget_size_allocate (child->widget, &allocation); gtk_widget_size_allocate (child->widget, &child_allocation);
} }
} }
@ -5220,7 +5220,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
if (gtk_tree_view_draw_expanders (tree_view)) if (gtk_tree_view_draw_expanders (tree_view))
{ {
int expander_size = gtk_tree_view_get_expander_size (tree_view);
if (!rtl) if (!rtl)
cell_area.x += depth * expander_size; cell_area.x += depth * expander_size;
cell_area.width -= depth * expander_size; cell_area.width -= depth * expander_size;
@ -5387,8 +5386,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
/* Draw indicator for the drop /* Draw indicator for the drop
*/ */
gint highlight_y = -1; gint highlight_y = -1;
GtkRBTree *tree = NULL; GtkRBTree *drag_tree = NULL;
GtkRBNode *node = NULL; GtkRBNode *drag_node = NULL;
gtk_style_context_save (context); gtk_style_context_save (context);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_DND); gtk_style_context_add_class (context, GTK_STYLE_CLASS_DND);
@ -5407,15 +5406,15 @@ G_GNUC_END_IGNORE_DEPRECATIONS
case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE: case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
case GTK_TREE_VIEW_DROP_INTO_OR_AFTER: case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
_gtk_tree_view_find_node (tree_view, drag_dest_path, &tree, &node); _gtk_tree_view_find_node (tree_view, drag_dest_path, &drag_tree, &drag_node);
if (tree == NULL) if (drag_tree == NULL)
break; break;
gtk_render_frame (context, cr, gtk_render_frame (context, cr,
0, gtk_tree_view_get_row_y_offset (tree_view, tree, node), 0, gtk_tree_view_get_row_y_offset (tree_view, drag_tree, drag_node),
gdk_window_get_width (tree_view->priv->bin_window), gdk_window_get_width (tree_view->priv->bin_window),
gtk_tree_view_get_row_height (tree_view, node)); gtk_tree_view_get_row_height (tree_view, drag_node));
break; break;
} }
@ -8440,8 +8439,8 @@ gtk_tree_view_header_focus (GtkTreeView *tree_view,
gboolean clamp_column_visible) gboolean clamp_column_visible)
{ {
GtkTreeViewColumn *column; GtkTreeViewColumn *column;
GtkWidget *focus_child;
GtkWidget *button; GtkWidget *button;
GtkWidget *focus_child;
GList *last_column, *first_column; GList *last_column, *first_column;
GList *tmp_list; GList *tmp_list;
gboolean rtl; gboolean rtl;
@ -8546,9 +8545,6 @@ gtk_tree_view_header_focus (GtkTreeView *tree_view,
while (tmp_list) while (tmp_list)
{ {
GtkTreeViewColumn *column;
GtkWidget *button;
if (dir == (rtl ? GTK_DIR_LEFT : GTK_DIR_RIGHT)) if (dir == (rtl ? GTK_DIR_LEFT : GTK_DIR_RIGHT))
tmp_list = tmp_list->next; tmp_list = tmp_list->next;
else else