GtkApplication: rewrite example application

The intended way of using GtkApplication is mainly by subclassing,
so make the example do that.
This commit is contained in:
Matthias Clasen 2010-11-05 16:25:29 -04:00 committed by Tristan Van Berkom
parent 9157e15653
commit 3b541bcfd4

View File

@ -1,13 +1,13 @@
#include <gtk/gtk.h>
static void
new_window (GtkApplication *app,
new_window (GApplication *app,
GFile *file)
{
GtkWidget *window, *scrolled, *view;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_application (GTK_WINDOW (window), app);
gtk_window_set_application (GTK_WINDOW (window), GTK_APPLICATION (app));
gtk_window_set_title (GTK_WINDOW (window), "Bloatpad");
scrolled = gtk_scrolled_window_new (NULL, NULL);
view = gtk_text_view_new ();
@ -33,17 +33,16 @@ new_window (GtkApplication *app,
}
static void
activate (GtkApplication *application)
bloat_pad_activate (GApplication *application)
{
new_window (application, NULL);
}
static void
open (GtkApplication *application,
bloat_pad_open (GApplication *application,
GFile **files,
gint n_files,
const gchar *hint,
gpointer user_data)
const gchar *hint)
{
gint i;
@ -51,18 +50,51 @@ open (GtkApplication *application,
new_window (application, files[i]);
}
typedef GtkApplication BloatPad;
typedef GtkApplicationClass BloatPadClass;
G_DEFINE_TYPE (BloatPad, bloat_pad, GTK_TYPE_APPLICATION)
static void
bloat_pad_finalize (GObject *object)
{
G_OBJECT_CLASS (bloat_pad_parent_class)->finalize (object);
}
static void
bloat_pad_init (BloatPad *app)
{
}
static void
bloat_pad_class_init (BloatPadClass *class)
{
G_OBJECT_CLASS (class)->finalize= bloat_pad_finalize;
G_APPLICATION_CLASS (class)->activate = bloat_pad_activate;
G_APPLICATION_CLASS (class)->open = bloat_pad_open;
}
BloatPad *
bloat_pad_new (void)
{
g_type_init ();
return g_object_new (bloat_pad_get_type (),
"application-id", "org.gtk.Test.bloatpad",
"flags", G_APPLICATION_HANDLES_OPEN,
NULL);
}
int
main (int argc, char **argv)
{
GtkApplication *app;
BloatPad *bloat_pad;
int status;
app = gtk_application_new ("org.gtk.Test.bloatpad",
G_APPLICATION_HANDLES_OPEN);
g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
g_signal_connect (app, "open", G_CALLBACK (open), NULL);
status = g_application_run (G_APPLICATION (app), argc, argv);
g_object_unref (app);
bloat_pad = bloat_pad_new ();
status = g_application_run (G_APPLICATION (bloat_pad), argc, argv);
g_object_unref (bloat_pad);
return status;
}