X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdict-display.h;h=2f9670f0cef46c101f0c4183e4a33518489647e0;hb=114cd2dc25959a7927730e502300321624f8c07b;hp=71479ba5503f47881d2edb4c6ce39d5a07d9e883;hpb=a10cebe053263d7e936b6533a3dbf5ac2f0586a1;p=pspp

diff --git a/src/ui/gui/dict-display.h b/src/ui/gui/dict-display.h
index 71479ba550..2f9670f0ce 100644
--- a/src/ui/gui/dict-display.h
+++ b/src/ui/gui/dict-display.h
@@ -1,10 +1,9 @@
-/*
-   PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.
    Copyright (C) 2007  Free Software Foundation
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -13,47 +12,55 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 
 /* This module provides various functions necessary for displaying a
    dictionary in  GTK widgets.
 */
 
+#ifndef DICT_DISPLAY
+#define DICT_DISPLAY 1
+
 #include <gtk/gtk.h>
 
 #include "psppire-selector.h"
-#include "psppire-dict.h"
-#include <data/variable.h>
 
-/* Sets up TREEVIEW to display the variables of DICT.
-   MODE is the selection mode for TREEVIEW.
-   PREDICATE determines which variables should be visible, or NULL if
-   all are to be visible.
- */
-void attach_dictionary_to_treeview (GtkTreeView *treeview, PsppireDict *dict,
-				    GtkSelectionMode mode,
-				    var_predicate_func *predicate
-				    );
 
+void
+get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter,
+		GtkTreeModel **model, GtkTreeIter *iter);
 
 /* A SelectItemsFunc function for GtkTreeView widgets */
 void insert_source_row_into_tree_view (GtkTreeIter source_iter,
 				       GtkWidget *dest,
-				       GtkTreeModel *source_model
-				       );
+				       GtkTreeModel *source_model,
+				       gpointer data);
+
+
+/* A SelectItemsFunc function for PsppireMeansLayers widgets */
+void insert_source_row_into_layers (GtkTreeIter source_iter,
+				    GtkWidget *dest,
+				    GtkTreeModel *source_model,
+				    gpointer data);
 
 
 /* A SelectItemsFunc function for GtkEntry widgets */
 void insert_source_row_into_entry (GtkTreeIter source_iter,
 				   GtkWidget *dest,
-				   GtkTreeModel *source_model
-				   );
+				   GtkTreeModel *source_model,
+				   gpointer data
+				);
 
 
 
 /* A FilterItemsFunc function for GtkEntry widgets */
 gboolean is_currently_in_entry (GtkTreeModel *model, GtkTreeIter *iter,
 				PsppireSelector *selector);
+
+
+/* A FilterItemsFunc function for PsppireVarview widgets */
+gboolean is_currently_in_varview (GtkTreeModel *model, GtkTreeIter *iter,
+				  PsppireSelector *sel);
+
+#endif