Hiroyuki Ikezoe
ikezo****@users*****
Fri Dec 1 12:57:06 JST 2006
Index: kazehakase/src/kz-statusbar.c
diff -u kazehakase/src/kz-statusbar.c:1.3 kazehakase/src/kz-statusbar.c:1.4
--- kazehakase/src/kz-statusbar.c:1.3 Thu Jun 8 22:39:18 2006
+++ kazehakase/src/kz-statusbar.c Fri Dec 1 12:57:06 2006
@@ -60,8 +60,6 @@
#define STATUS_GESTURE "INTERNAL_GESTURE"
#define STATUS_SEARCH "INTERNAL_SEARCH"
-static void kz_statusbar_class_init (KzStatusbarClass *klass);
-static void kz_statusbar_init (KzStatusbar *bar);
static GObject *kz_statusbar_constructor (GType type,
guint n_props,
GObjectConstructParam *props);
@@ -86,11 +84,7 @@
static void cb_find_direction_toggle (GtkToggleButton *button,
KzStatusbar *bar);
-static GtkHBoxClass *parent_class = NULL;
-
-KZ_OBJECT_GET_TYPE (kz_statusbar, "KzStatusbar", KzStatusbar,
- kz_statusbar_class_init, kz_statusbar_init,
- GTK_TYPE_HBOX)
+G_DEFINE_TYPE (KzStatusbar, kz_statusbar, GTK_TYPE_HBOX)
static void
kz_statusbar_class_init (KzStatusbarClass *klass)
@@ -98,8 +92,6 @@
GObjectClass *gobject_class;
GtkWidgetClass *widget_class;
- parent_class = g_type_class_peek_parent(klass);
-
gobject_class = (GObjectClass *)klass;
widget_class = (GtkWidgetClass *)klass;
@@ -221,7 +213,7 @@
{
KzStatusbar *bar;
GObject *object;
- GObjectClass *klass = G_OBJECT_CLASS(parent_class);
+ GObjectClass *klass = G_OBJECT_CLASS(kz_statusbar_parent_class);
GtkWidget *widget;
object = klass->constructor(type, n_props, props);
@@ -314,8 +306,8 @@
priv->find_tips[1] = NULL;
}
- if (G_OBJECT_CLASS(parent_class)->dispose)
- (*G_OBJECT_CLASS(parent_class)->dispose) (object);
+ if (G_OBJECT_CLASS(kz_statusbar_parent_class)->dispose)
+ (*G_OBJECT_CLASS(kz_statusbar_parent_class)->dispose) (object);
}