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:
committed by
Tristan Van Berkom
parent
9157e15653
commit
3b541bcfd4
@ -1,13 +1,13 @@
|
|||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
static void
|
static void
|
||||||
new_window (GtkApplication *app,
|
new_window (GApplication *app,
|
||||||
GFile *file)
|
GFile *file)
|
||||||
{
|
{
|
||||||
GtkWidget *window, *scrolled, *view;
|
GtkWidget *window, *scrolled, *view;
|
||||||
|
|
||||||
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
|
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");
|
gtk_window_set_title (GTK_WINDOW (window), "Bloatpad");
|
||||||
scrolled = gtk_scrolled_window_new (NULL, NULL);
|
scrolled = gtk_scrolled_window_new (NULL, NULL);
|
||||||
view = gtk_text_view_new ();
|
view = gtk_text_view_new ();
|
||||||
@ -33,17 +33,16 @@ new_window (GtkApplication *app,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
activate (GtkApplication *application)
|
bloat_pad_activate (GApplication *application)
|
||||||
{
|
{
|
||||||
new_window (application, NULL);
|
new_window (application, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
open (GtkApplication *application,
|
bloat_pad_open (GApplication *application,
|
||||||
GFile **files,
|
GFile **files,
|
||||||
gint n_files,
|
gint n_files,
|
||||||
const gchar *hint,
|
const gchar *hint)
|
||||||
gpointer user_data)
|
|
||||||
{
|
{
|
||||||
gint i;
|
gint i;
|
||||||
|
|
||||||
@ -51,18 +50,51 @@ open (GtkApplication *application,
|
|||||||
new_window (application, files[i]);
|
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
|
int
|
||||||
main (int argc, char **argv)
|
main (int argc, char **argv)
|
||||||
{
|
{
|
||||||
GtkApplication *app;
|
BloatPad *bloat_pad;
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
app = gtk_application_new ("org.gtk.Test.bloatpad",
|
bloat_pad = bloat_pad_new ();
|
||||||
G_APPLICATION_HANDLES_OPEN);
|
status = g_application_run (G_APPLICATION (bloat_pad), argc, argv);
|
||||||
g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
|
g_object_unref (bloat_pad);
|
||||||
g_signal_connect (app, "open", G_CALLBACK (open), NULL);
|
|
||||||
status = g_application_run (G_APPLICATION (app), argc, argv);
|
|
||||||
g_object_unref (app);
|
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user