projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
examples: Change extensions from .stat to .sps.
[pspp]
/
src
/
ui
/
gui
/
psppire-window.c
diff --git
a/src/ui/gui/psppire-window.c
b/src/ui/gui/psppire-window.c
index 4eb274b5284805b3cfc8742499d11c1409cd7a26..4c7fcf57dc2040c32357e9e371bbad8f6339d75d 100644
(file)
--- a/
src/ui/gui/psppire-window.c
+++ b/
src/ui/gui/psppire-window.c
@@
-17,6
+17,7
@@
#include <config.h>
#include "psppire-window.h"
#include <config.h>
#include "psppire-window.h"
+#include "psppire-window-base.h"
#include <gtk/gtk.h>
#include <gtk/gtk.h>
@@
-32,7
+33,6
@@
#include "data/dataset.h"
#include "helper.h"
#include "data/dataset.h"
#include "helper.h"
-#include "psppire-conf.h"
#include "psppire-data-window.h"
#include "psppire-encoding-selector.h"
#include "psppire-syntax-window.h"
#include "psppire-data-window.h"
#include "psppire-encoding-selector.h"
#include "psppire-syntax-window.h"
@@
-67,7
+67,7
@@
psppire_window_get_type (void)
};
psppire_window_type =
};
psppire_window_type =
- g_type_register_static (
GTK_TYPE_WINDOW
, "PsppireWindow",
+ g_type_register_static (
PSPPIRE_TYPE_WINDOW_BASE
, "PsppireWindow",
&psppire_window_info, G_TYPE_FLAG_ABSTRACT);
}
&psppire_window_info, G_TYPE_FLAG_ABSTRACT);
}
@@
-229,17
+229,6
@@
psppire_window_get_property (GObject *object,
}
}
-static void
-on_realize (GtkWindow *window, gpointer data)
-{
- PsppireConf *conf = psppire_conf_new ();
-
- const gchar *base = G_OBJECT_TYPE_NAME (window);
-
- psppire_conf_set_window_geometry (conf, base, window);
-}
-
-
static void
psppire_window_finalize (GObject *object)
{
static void
psppire_window_finalize (GObject *object)
{
@@
-423,13
+412,6
@@
on_delete (PsppireWindow *w, GdkEvent *event, gpointer user_data)
{
PsppireWindowRegister *reg = psppire_window_register_new ();
{
PsppireWindowRegister *reg = psppire_window_register_new ();
- const gchar *base = G_OBJECT_TYPE_NAME (w);
-
- PsppireConf *conf = psppire_conf_new ();
-
- psppire_conf_save_window_geometry (conf, base, GTK_WINDOW (w));
-
-
if ( w->dirty )
{
gint response = psppire_window_query_save (w);
if ( w->dirty )
{
gint response = psppire_window_query_save (w);
@@
-490,9
+472,6
@@
psppire_window_init (PsppireWindow *window)
g_signal_connect_swapped (window, "delete-event", G_CALLBACK (on_delete), window);
g_object_set (window, "icon-name", "pspp", NULL);
g_signal_connect_swapped (window, "delete-event", G_CALLBACK (on_delete), window);
g_object_set (window, "icon-name", "pspp", NULL);
-
- g_signal_connect (window, "realize",
- G_CALLBACK (on_realize), window);
}
/*
}
/*