X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpspp-sheet-selection.c;h=98089147f92ed4664f6cd5ee4301ec301420fc7e;hb=9a4fd397b9ef95cbeb033cd7d92a3bebfe8709fc;hp=9cd65028b49af59aa26347db702f62346573971d;hpb=3bc8bee4dbb8a204fb61b0dfe97c4468899dd1c3;p=pspp diff --git a/src/ui/gui/pspp-sheet-selection.c b/src/ui/gui/pspp-sheet-selection.c index 9cd65028b4..98089147f9 100644 --- a/src/ui/gui/pspp-sheet-selection.c +++ b/src/ui/gui/pspp-sheet-selection.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2011, 2012 Free Software Foundation, Inc. + Copyright (C) 2011, 2012, 2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -238,9 +238,9 @@ pspp_sheet_selection_get_mode (PsppSheetSelection *selection) /** * pspp_sheet_selection_get_tree_view: * @selection: A #PsppSheetSelection - * + * * Returns the tree view associated with @selection. - * + * * Return value: A #PsppSheetView **/ PsppSheetView * @@ -402,7 +402,7 @@ pspp_sheet_selection_get_selected_rows (PsppSheetSelection *selection, * Returns the number of rows that have been selected in @tree. * * Return value: The number of rows selected. - * + * * Since: 2.2 **/ gint @@ -501,7 +501,7 @@ pspp_sheet_selection_selected_foreach (PsppSheetSelection *selection, G_CALLBACK (model_changed), &stop); changed_id = g_signal_connect_swapped (selection->tree_view, "notify::model", - G_CALLBACK (model_changed), + G_CALLBACK (model_changed), &stop); RANGE_TOWER_FOR_EACH (node, start, selection->tree_view->priv->selected) @@ -547,7 +547,7 @@ pspp_sheet_selection_select_path (PsppSheetSelection *selection, GtkTreePath *path) { int node; - GtkTreeSelectMode mode = 0; + PsppSheetSelectMode mode = 0; g_return_if_fail (PSPP_IS_SHEET_SELECTION (selection)); g_return_if_fail (selection->tree_view != NULL); @@ -557,12 +557,12 @@ pspp_sheet_selection_select_path (PsppSheetSelection *selection, path, &node); - if (node < 0 || pspp_sheet_view_node_is_selected (selection->tree_view, node)) + if (node < 0 || pspp_sheet_view_node_is_selected (selection->tree_view, node)) return; if (selection->type == PSPP_SHEET_SELECTION_MULTIPLE || selection->type == PSPP_SHEET_SELECTION_RECTANGLE) - mode = GTK_TREE_SELECT_MODE_TOGGLE; + mode = PSPP_SHEET_SELECT_MODE_TOGGLE; _pspp_sheet_selection_internal_select_node (selection, node, @@ -592,13 +592,13 @@ pspp_sheet_selection_unselect_path (PsppSheetSelection *selection, path, &node); - if (node < 0 || !pspp_sheet_view_node_is_selected (selection->tree_view, node)) + if (node < 0 || !pspp_sheet_view_node_is_selected (selection->tree_view, node)) return; _pspp_sheet_selection_internal_select_node (selection, node, path, - GTK_TREE_SELECT_MODE_TOGGLE, + PSPP_SHEET_SELECT_MODE_TOGGLE, TRUE); } @@ -663,10 +663,10 @@ pspp_sheet_selection_unselect_iter (PsppSheetSelection *selection, * pspp_sheet_selection_path_is_selected: * @selection: A #PsppSheetSelection. * @path: A #GtkTreePath to check selection on. - * + * * Returns %TRUE if the row pointed to by @path is currently selected. If @path * does not point to a valid location, %FALSE is returned - * + * * Return value: %TRUE if @path is selected. **/ gboolean @@ -686,7 +686,7 @@ pspp_sheet_selection_path_is_selected (PsppSheetSelection *selection, path, &node); - if (node < 0 || !pspp_sheet_view_node_is_selected (selection->tree_view, node)) + if (node < 0 || !pspp_sheet_view_node_is_selected (selection->tree_view, node)) return FALSE; return TRUE; @@ -696,9 +696,9 @@ pspp_sheet_selection_path_is_selected (PsppSheetSelection *selection, * pspp_sheet_selection_iter_is_selected: * @selection: A #PsppSheetSelection * @iter: A valid #GtkTreeIter - * + * * Returns %TRUE if the row at @iter is currently selected. - * + * * Return value: %TRUE, if @iter is selected **/ gboolean @@ -839,7 +839,7 @@ pspp_sheet_selection_unselect_all (PsppSheetSelection *selection) if (selection->tree_view->priv->row_count == 0 || selection->tree_view->priv->model == NULL) return; - + if (pspp_sheet_selection_real_unselect_all (selection)) g_signal_emit (selection, tree_selection_signals[CHANGED], 0); } @@ -1001,7 +1001,7 @@ void _pspp_sheet_selection_internal_select_node (PsppSheetSelection *selection, int node, GtkTreePath *path, - GtkTreeSelectMode mode, + PsppSheetSelectMode mode, gboolean override_browse_mode) { gint dirty = FALSE; @@ -1025,7 +1025,7 @@ _pspp_sheet_selection_internal_select_node (PsppSheetSelection *selection, else if (selection->type == PSPP_SHEET_SELECTION_SINGLE && anchor_path && gtk_tree_path_compare (path, anchor_path) == 0) { - if ((mode & GTK_TREE_SELECT_MODE_TOGGLE) == GTK_TREE_SELECT_MODE_TOGGLE) + if ((mode & PSPP_SHEET_SELECT_MODE_TOGGLE) == PSPP_SHEET_SELECT_MODE_TOGGLE) { dirty = pspp_sheet_selection_real_unselect_all (selection); } @@ -1070,7 +1070,7 @@ _pspp_sheet_selection_internal_select_node (PsppSheetSelection *selection, else if (selection->type == PSPP_SHEET_SELECTION_MULTIPLE || selection->type == PSPP_SHEET_SELECTION_RECTANGLE) { - if ((mode & GTK_TREE_SELECT_MODE_EXTEND) == GTK_TREE_SELECT_MODE_EXTEND + if ((mode & PSPP_SHEET_SELECT_MODE_EXTEND) == PSPP_SHEET_SELECT_MODE_EXTEND && (anchor_path == NULL)) { if (selection->tree_view->priv->anchor) @@ -1080,13 +1080,13 @@ _pspp_sheet_selection_internal_select_node (PsppSheetSelection *selection, gtk_tree_row_reference_new_proxy (G_OBJECT (selection->tree_view), selection->tree_view->priv->model, path); dirty = pspp_sheet_selection_real_select_node (selection, node, TRUE); } - else if ((mode & (GTK_TREE_SELECT_MODE_EXTEND | GTK_TREE_SELECT_MODE_TOGGLE)) == (GTK_TREE_SELECT_MODE_EXTEND | GTK_TREE_SELECT_MODE_TOGGLE)) + else if ((mode & (PSPP_SHEET_SELECT_MODE_EXTEND | PSPP_SHEET_SELECT_MODE_TOGGLE)) == (PSPP_SHEET_SELECT_MODE_EXTEND | PSPP_SHEET_SELECT_MODE_TOGGLE)) { pspp_sheet_selection_select_range (selection, anchor_path, path); } - else if ((mode & GTK_TREE_SELECT_MODE_TOGGLE) == GTK_TREE_SELECT_MODE_TOGGLE) + else if ((mode & PSPP_SHEET_SELECT_MODE_TOGGLE) == PSPP_SHEET_SELECT_MODE_TOGGLE) { bool selected = pspp_sheet_view_node_is_selected (selection->tree_view, node); if (selection->tree_view->priv->anchor) @@ -1100,7 +1100,7 @@ _pspp_sheet_selection_internal_select_node (PsppSheetSelection *selection, else dirty |= pspp_sheet_selection_real_select_node (selection, node, TRUE); } - else if ((mode & GTK_TREE_SELECT_MODE_EXTEND) == GTK_TREE_SELECT_MODE_EXTEND) + else if ((mode & PSPP_SHEET_SELECT_MODE_EXTEND) == PSPP_SHEET_SELECT_MODE_EXTEND) { dirty = pspp_sheet_selection_real_unselect_all (selection); dirty |= pspp_sheet_selection_real_modify_range (selection, @@ -1126,14 +1126,14 @@ _pspp_sheet_selection_internal_select_node (PsppSheetSelection *selection, gtk_tree_path_free (anchor_path); if (dirty) - g_signal_emit (selection, tree_selection_signals[CHANGED], 0); + g_signal_emit (selection, tree_selection_signals[CHANGED], 0); } -void +void _pspp_sheet_selection_emit_changed (PsppSheetSelection *selection) { - g_signal_emit (selection, tree_selection_signals[CHANGED], 0); + g_signal_emit (selection, tree_selection_signals[CHANGED], 0); } /* NOTE: Any {un,}selection ever done _MUST_ be done through this function! @@ -1153,7 +1153,7 @@ pspp_sheet_selection_real_select_node (PsppSheetSelection *selection, pspp_sheet_view_node_unselect (selection->tree_view, node); _pspp_sheet_view_queue_draw_node (selection->tree_view, node, NULL); - + return TRUE; }