diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-08-30 14:56:28 +0900 |
| commit | 54d44a9bd04cfbed8426614fc69c027a46f41a14 (patch) | |
| tree | 34bdf65a6e8d5d6d4016154345d1d803ba0da379 /gtk/gtktoolshell.c | |
| parent | b3b22c31b997fb85b3319b392a1a69407703184c (diff) | |
| parent | 67194ed77b153eb5a7eb6c596f3c20e274b7787a (diff) | |
| download | gtk+-native-layout.tar.gz | |
Merge branch 'master' into native-layoutnative-layout
Conflicts:
gtk/gtkplug.c
gtk/gtkscrolledwindow.c
Diffstat (limited to 'gtk/gtktoolshell.c')
| -rw-r--r-- | gtk/gtktoolshell.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/gtk/gtktoolshell.c b/gtk/gtktoolshell.c index 5a73c08d38..ead74d41d9 100644 --- a/gtk/gtktoolshell.c +++ b/gtk/gtktoolshell.c @@ -43,22 +43,17 @@ * Dummy structure for accessing instances of #GtkToolShellIface. */ -GType -gtk_tool_shell_get_type (void) -{ - static GType type = 0; - if (!type) - { - type = g_type_register_static_simple (G_TYPE_INTERFACE, I_("GtkToolShell"), - sizeof (GtkToolShellIface), - NULL, 0, NULL, 0); - g_type_interface_add_prerequisite (type, GTK_TYPE_WIDGET); - } +typedef GtkToolShellIface GtkToolShellInterface; +G_DEFINE_INTERFACE (GtkToolShell, gtk_tool_shell, GTK_TYPE_WIDGET); + - return type; +static void +gtk_tool_shell_default_init (GtkToolShellInterface *iface) +{ } + /** * gtk_tool_shell_get_icon_size: * @shell: a #GtkToolShell |