X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=cdd00dca1d46c6efb6bd8892295f29ae8bcb0b9a;hb=905ec939774f017a3e7108826d60c9c6072131c5;hp=5facbbd257dfc9f0c3bd78aece4bff2a9f6055b7;hpb=c7b5e2dcfaeb0221b801dc3cc9fa1ab9a4ec5861;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 5facbbd2..cdd00dca 100644
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -100,19 +100,15 @@ psppire_data_window_get_type (void)
   return psppire_data_window_type;
 }
 
+static GObjectClass *parent_class ;
 
 static void
 psppire_data_window_finalize (GObject *object)
 {
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (object);
 
-  GObjectClass *class = G_OBJECT_GET_CLASS (object);
-
-  GObjectClass *parent_class = g_type_class_peek_parent (class);
-
   g_object_unref (de->xml);
 
-
   if (G_OBJECT_CLASS (parent_class)->finalize)
     (*G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
@@ -121,6 +117,7 @@ psppire_data_window_finalize (GObject *object)
 static void
 psppire_data_window_class_init (PsppireDataWindowClass *class)
 {
+  parent_class = g_type_class_peek_parent (class);
 }
 
 
@@ -337,7 +334,7 @@ open_data_file (const gchar *file_name, PsppireDataWindow *de)
 
   if (execute_syntax (sss) )
   {
-    //    window_set_name_from_filename ((struct editor_window *) de, file_name);
+    psppire_window_set_filename (PSPPIRE_WINDOW (de), file_name);
     add_most_recent (file_name);
   }
 }
@@ -544,7 +541,7 @@ data_save_as_dialog (GtkAction *action, PsppireDataWindow *de)
 
 	save_file (de);
 
-	//	window_set_name_from_filename (e, de->file_name);
+	psppire_window_set_filename (PSPPIRE_WINDOW (de), de->file_name);
       }
       break;
     default:
@@ -581,7 +578,7 @@ new_file (GtkAction *action, PsppireDataWindow *de)
   g_free (de->file_name);
   de->file_name = NULL;
 
-  //  default_window_name (de);
+  psppire_window_set_filename (PSPPIRE_WINDOW (de), NULL);
 }
 
 
@@ -1005,14 +1002,6 @@ on_switch_sheet (GtkNotebook *notebook,
 
 
 
-void
-create_data_window (void)
-{
-  GtkWidget *w = psppire_data_window_new ();
-  gtk_widget_show (w);
-}
-
-
 static void
 psppire_data_window_init (PsppireDataWindow *de)
 {
@@ -1705,6 +1694,7 @@ psppire_data_window_init (PsppireDataWindow *de)
   de->data_sheet_cases_popup_menu =
     GTK_MENU (create_data_sheet_cases_popup_menu (de));
 
+  PSPPIRE_WINDOW (de)->menu = GTK_MENU_SHELL (get_widget_assert (de->xml,"Windows_menu"));
 
   g_object_set (de->data_editor,
 		"datasheet-column-menu", de->data_sheet_variable_popup_menu,
@@ -1712,7 +1702,7 @@ psppire_data_window_init (PsppireDataWindow *de)
 		"varsheet-row-menu", de->var_sheet_variable_popup_menu,
 		NULL);
 
-  gtk_widget_show (de->data_editor);
+  gtk_widget_show (GTK_WIDGET (de->data_editor));
   gtk_widget_show (box);
 }
 
@@ -1721,7 +1711,7 @@ GtkWidget*
 psppire_data_window_new (void)
 {
   return GTK_WIDGET (g_object_new (psppire_data_window_get_type (),
-				   "usage", PSPPIRE_WINDOW_USAGE_DATA,
+				   "description", _("Data Editor"),
 				   NULL));
 }