Merge remote branch 'origin/master' into import-gui

[pspp] / src / ui / gui / psppire-dictview.h

diff --git a/src/ui/gui/psppire-dictview.h b/src/ui/gui/psppire-dictview.h
index 98000ff58ef59f18dbaa6ecd70a15e98d9ca794a..1a8ddbb9235d1708ee4de4dbefb09f738bcbbfff 100644 (file)
--- a/src/ui/gui/psppire-dictview.h
+++ b/src/ui/gui/psppire-dictview.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2009  Free Software Foundation
+   Copyright (C) 2009, 2010  Free Software Foundation
 
    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
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 #include "psppire-dict.h"
 #include "dict-display.h"
@@ -49,6 +49,8 @@ struct _PsppireDictView
 
   PsppireDict *dict;
   var_predicate_func *predicate;
+  GtkWidget *menu;
+  gboolean prefer_labels;
 };
 
 struct _PsppireDictViewClass