Hiroyuki Ikezoe
ikezo****@users*****
Thu Nov 30 18:45:28 JST 2006
Index: kazehakase/src/kz-window.c
diff -u kazehakase/src/kz-window.c:1.274 kazehakase/src/kz-window.c:1.275
--- kazehakase/src/kz-window.c:1.274 Sun Oct 22 00:38:45 2006
+++ kazehakase/src/kz-window.c Thu Nov 30 18:45:28 2006
@@ -32,7 +32,6 @@
#include "kz-marshalers.h"
#include "kz-history-action.h"
#include "kz-zoom-action.h"
-#include "gobject-utils.h"
#include "gtk-utils.h"
#include "kz-actions.h"
#include "kz-actions-popup.h"
@@ -136,8 +135,6 @@
static gboolean key_theme_is_emacs = FALSE;
-static void kz_window_class_init (KzWindowClass *klass);
-static void kz_window_init (KzWindow *kz);
static gboolean kz_window_delete_event (GtkWidget *widget,
GdkEventAny *event);
static gboolean kz_window_key_press_event(GtkWidget *widget,
@@ -299,14 +296,12 @@
void kz_window_sync_proxy (KzWindow *kz);
-static GtkWindowClass *parent_class = NULL;
static gint kz_window_signals[LAST_SIGNAL] = {0};
static GList *window_list = NULL;
-KZ_OBJECT_GET_TYPE(kz_window, "KzWindow", KzWindow,
- kz_window_class_init, kz_window_init,
- GTK_TYPE_WINDOW)
+G_DEFINE_TYPE(KzWindow, kz_window, GTK_TYPE_WINDOW)
+
static void
kz_window_class_init (KzWindowClass *klass)
@@ -315,8 +310,6 @@
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
- parent_class = g_type_class_peek_parent (klass);
-
gobject_class = (GObjectClass *) klass;
object_class = (GtkObjectClass *) klass;
widget_class = (GtkWidgetClass *) klass;
@@ -1448,7 +1441,7 @@
return TRUE;
}
#endif
- return GTK_WIDGET_CLASS(parent_class)->key_press_event(widget, event);
+ return GTK_WIDGET_CLASS(kz_window_parent_class)->key_press_event(widget, event);
}
@@ -1458,8 +1451,8 @@
KzWindow *kz = KZ_WINDOW(object);
KzWindowPrivate *priv = KZ_WINDOW_GET_PRIVATE (kz);
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- GTK_OBJECT_CLASS (parent_class)->destroy(object);
+ if (GTK_OBJECT_CLASS (kz_window_parent_class)->destroy)
+ GTK_OBJECT_CLASS (kz_window_parent_class)->destroy(object);
window_list = g_list_remove(window_list, kz);