X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-window-base.c;h=7764babc62cbe3d5a34db53438fccb96d3abd91f;hb=40c169c1409b0f16e6ee8f0ceaa0ce6937c90a5c;hp=29c0fd7a5851e6119b12b52ad3c6d227b72ab63d;hpb=b367f5ac49aa1b4f0ea7d76e322e40b824f607b9;p=pspp diff --git a/src/ui/gui/psppire-window-base.c b/src/ui/gui/psppire-window-base.c index 29c0fd7a58..7764babc62 100644 --- a/src/ui/gui/psppire-window-base.c +++ b/src/ui/gui/psppire-window-base.c @@ -16,7 +16,7 @@ /* This is an abstract base class upon which all (well almost all) windows in - psppire are based. The exceptions are transient windows such as the + psppire are based. The exceptions are transient windows such as the splash screen and popups. It currently provides the feature where the window's geometry "persists" @@ -35,7 +35,7 @@ static void psppire_window_base_class_init (PsppireWindowBaseClass *class); static void psppire_window_base_init (PsppireWindowBase *window); -G_DEFINE_ABSTRACT_TYPE (PsppireWindowBase, psppire_window_base, GTK_TYPE_WINDOW); +G_DEFINE_ABSTRACT_TYPE (PsppireWindowBase, psppire_window_base, GTK_TYPE_APPLICATION_WINDOW); /* Obtain a string identifying this window. @@ -46,10 +46,7 @@ G_DEFINE_ABSTRACT_TYPE (PsppireWindowBase, psppire_window_base, GTK_TYPE_WINDOW) static const char * get_window_id (GtkWidget *wb) { - const gchar *name = NULL; - - g_object_get (wb, "name", &name, NULL); - + const gchar *name = gtk_widget_get_name (wb); if (NULL == name || 0 == strcmp ("", name)) name = G_OBJECT_TYPE_NAME (wb); @@ -91,7 +88,7 @@ configure_event (GtkWidget *wb, GdkEventConfigure *event) return FALSE; } -static void +static void psppire_window_base_class_init (PsppireWindowBaseClass *class) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); @@ -99,7 +96,7 @@ psppire_window_base_class_init (PsppireWindowBaseClass *class) widget_class->realize = realize; } -static void +static void psppire_window_base_init (PsppireWindowBase *window) { }