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=afb6c8a97d488c82fc6220a41e1e2a0af27a6e82;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp

diff --git a/src/ui/gui/dict-display.h b/src/ui/gui/dict-display.h
index afb6c8a97d..2f9670f0ce 100644
--- a/src/ui/gui/dict-display.h
+++ b/src/ui/gui/dict-display.h
@@ -19,35 +19,38 @@
    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
+				);
 
 
 
@@ -56,6 +59,8 @@ gboolean is_currently_in_entry (GtkTreeModel *model, GtkTreeIter *iter,
 				PsppireSelector *selector);
 
 
-void get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter,
-		     GtkTreeModel **model, GtkTreeIter *iter
-		     );
+/* A FilterItemsFunc function for PsppireVarview widgets */
+gboolean is_currently_in_varview (GtkTreeModel *model, GtkTreeIter *iter,
+				  PsppireSelector *sel);
+
+#endif