New (singleton) object psppire-window-register

[pspp-builds.git] / src / ui / gui / psppire-window.h

diff --git a/src/ui/gui/psppire-window.h b/src/ui/gui/psppire-window.h
index ca5136a7bafc32cd28696ab0c0efdc52479a5858..ef7feb2326884b746017957b54d7d4e0cfdc7830 100644 (file)
--- a/src/ui/gui/psppire-window.h
+++ b/src/ui/gui/psppire-window.h
@@ -23,6 +23,7 @@
 #include <glib-object.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtkaction.h>
+#include <gtk/gtkmenushell.h>
 
 G_BEGIN_DECLS
 
@@ -62,15 +63,18 @@ struct _PsppireWindow
 
   /* <private> */
   gchar *name;
-  gboolean finalized;
   PsppireWindowUsage usage;
+
+  GHashTable *menuitem_table;
+  GtkMenuShell *menu;
+
+  guint insert_handler;
+  guint remove_handler;
 };
 
 struct _PsppireWindowClass
 {
   GtkWindowClass parent_class;
-
-  GHashTable *name_table;
 };
 
 GType      psppire_window_get_type        (void);