- gtk_signal_connect(GTK_OBJECT(fe->window), "destroy",
- GTK_SIGNAL_FUNC(destroy), fe);
- gtk_signal_connect(GTK_OBJECT(fe->window), "key_press_event",
- GTK_SIGNAL_FUNC(key_event), fe);
- gtk_signal_connect(GTK_OBJECT(fe->area), "button_press_event",
- GTK_SIGNAL_FUNC(button_event), fe);
- gtk_signal_connect(GTK_OBJECT(fe->area), "button_release_event",
- GTK_SIGNAL_FUNC(button_event), fe);
- gtk_signal_connect(GTK_OBJECT(fe->area), "motion_notify_event",
- GTK_SIGNAL_FUNC(motion_event), fe);
- gtk_signal_connect(GTK_OBJECT(fe->area), "selection_get",
- GTK_SIGNAL_FUNC(selection_get), fe);
- gtk_signal_connect(GTK_OBJECT(fe->area), "selection_clear_event",
- GTK_SIGNAL_FUNC(selection_clear), fe);
- gtk_signal_connect(GTK_OBJECT(fe->area), "expose_event",
- GTK_SIGNAL_FUNC(expose_area), fe);
- gtk_signal_connect(GTK_OBJECT(fe->window), "map_event",
- GTK_SIGNAL_FUNC(map_window), fe);
- gtk_signal_connect(GTK_OBJECT(fe->area), "configure_event",
- GTK_SIGNAL_FUNC(configure_area), fe);
- gtk_signal_connect(GTK_OBJECT(fe->window), "configure_event",
- GTK_SIGNAL_FUNC(configure_window), fe);
+ g_signal_connect(G_OBJECT(fe->window), "destroy",
+ G_CALLBACK(destroy), fe);
+ g_signal_connect(G_OBJECT(fe->window), "key_press_event",
+ G_CALLBACK(key_event), fe);
+ g_signal_connect(G_OBJECT(fe->area), "button_press_event",
+ G_CALLBACK(button_event), fe);
+ g_signal_connect(G_OBJECT(fe->area), "button_release_event",
+ G_CALLBACK(button_event), fe);
+ g_signal_connect(G_OBJECT(fe->area), "motion_notify_event",
+ G_CALLBACK(motion_event), fe);
+ g_signal_connect(G_OBJECT(fe->area), "selection_get",
+ G_CALLBACK(selection_get), fe);
+ g_signal_connect(G_OBJECT(fe->area), "selection_clear_event",
+ G_CALLBACK(selection_clear), fe);
+#if GTK_CHECK_VERSION(3,0,0)
+ g_signal_connect(G_OBJECT(fe->area), "draw",
+ G_CALLBACK(draw_area), fe);
+#else
+ g_signal_connect(G_OBJECT(fe->area), "expose_event",
+ G_CALLBACK(expose_area), fe);
+#endif
+ g_signal_connect(G_OBJECT(fe->window), "map_event",
+ G_CALLBACK(map_window), fe);
+ g_signal_connect(G_OBJECT(fe->area), "configure_event",
+ G_CALLBACK(configure_area), fe);
+ g_signal_connect(G_OBJECT(fe->window), "configure_event",
+ G_CALLBACK(configure_window), fe);