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/gtkcelllayout.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/gtkcelllayout.c')
| -rw-r--r-- | gtk/gtkcelllayout.c | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c index 985457be85..86e8e39644 100644 --- a/gtk/gtkcelllayout.c +++ b/gtk/gtkcelllayout.c @@ -25,34 +25,13 @@ #include "gtkintl.h" -GType -gtk_cell_layout_get_type (void) -{ - static GType cell_layout_type = 0; +typedef GtkCellLayoutIface GtkCellLayoutInterface; +G_DEFINE_INTERFACE (GtkCellLayout, gtk_cell_layout, G_TYPE_OBJECT); - if (! cell_layout_type) - { - const GTypeInfo cell_layout_info = - { - sizeof (GtkCellLayoutIface), - NULL, - NULL, - NULL, - NULL, - NULL, - 0, - 0, - NULL - }; - - cell_layout_type = - g_type_register_static (G_TYPE_INTERFACE, I_("GtkCellLayout"), - &cell_layout_info, 0); - - g_type_interface_add_prerequisite (cell_layout_type, G_TYPE_OBJECT); - } - return cell_layout_type; +static void +gtk_cell_layout_default_init (GtkCellLayoutInterface *iface) +{ } /** |