diff -up xscorch-0.2.1-pre2/sgtk/sexplosion-gtk.c.newgtk xscorch-0.2.1-pre2/sgtk/sexplosion-gtk.c
--- xscorch-0.2.1-pre2/sgtk/sexplosion-gtk.c.newgtk	2009-04-26 19:39:48.000000000 +0200
+++ xscorch-0.2.1-pre2/sgtk/sexplosion-gtk.c	2010-12-15 22:31:41.802088001 +0100
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#define  __ALLOW_DEPRECATED_GDK__
 #include <sgtk.h>
 #include <sdisplay.h>
 
diff -up xscorch-0.2.1-pre2/sgtk/simage-gtk.c.newgtk xscorch-0.2.1-pre2/sgtk/simage-gtk.c
--- xscorch-0.2.1-pre2/sgtk/simage-gtk.c.newgtk	2009-04-26 19:39:48.000000000 +0200
+++ xscorch-0.2.1-pre2/sgtk/simage-gtk.c	2010-12-15 22:31:41.803088001 +0100
@@ -21,6 +21,7 @@
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 */
+#define  __ALLOW_DEPRECATED_GDK__
 #include <sgtk.h>
 #include <simage-gtk.h>
 
diff -up xscorch-0.2.1-pre2/sgtk/soptions-gtk.c.newgtk xscorch-0.2.1-pre2/sgtk/soptions-gtk.c
--- xscorch-0.2.1-pre2/sgtk/soptions-gtk.c.newgtk	2009-04-26 19:39:49.000000000 +0200
+++ xscorch-0.2.1-pre2/sgtk/soptions-gtk.c	2010-12-15 22:33:46.864087981 +0100
@@ -71,11 +71,13 @@ static void _sc_options_setup_apply_gtk(
    
    /* Reconfigure the statusbar */
    if(oldextstatus != co->extstatus) sc_status_setup(setup->c->window);
+#if 0
    if(oldtooltips != co->tooltips) {
       /* TEMP - 99.44% likely this does not work. */
       if(co->tooltips) gtk_tooltips_enable(w);
       else             gtk_tooltips_disable(w);
    }
+#endif
       
    #if USE_NETWORK
    if(SC_NETWORK_SERVER(setup->c)) sc_net_server_send_config(setup->c, setup->c->server);
diff -up xscorch-0.2.1-pre2/sgtk/spaint-gtk.c.newgtk xscorch-0.2.1-pre2/sgtk/spaint-gtk.c
--- xscorch-0.2.1-pre2/sgtk/spaint-gtk.c.newgtk	2009-04-26 19:39:49.000000000 +0200
+++ xscorch-0.2.1-pre2/sgtk/spaint-gtk.c	2010-12-15 22:31:41.805088001 +0100
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#define  __ALLOW_DEPRECATED_GDK__
 #include <sgtk.h>
 #include <sconsole.h>
 #include <sdisplay.h>
diff -up xscorch-0.2.1-pre2/sgtk/sspill-gtk.c.newgtk xscorch-0.2.1-pre2/sgtk/sspill-gtk.c
--- xscorch-0.2.1-pre2/sgtk/sspill-gtk.c.newgtk	2009-04-26 19:39:50.000000000 +0200
+++ xscorch-0.2.1-pre2/sgtk/sspill-gtk.c	2010-12-15 22:31:41.806088001 +0100
@@ -21,6 +21,7 @@
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 */
+#define  __ALLOW_DEPRECATED_GDK__
 #include <sgtk.h>
 #include <sdisplay.h>
 
diff -up xscorch-0.2.1-pre2/sgtk/swidgets/sactiveconsole.c.newgtk xscorch-0.2.1-pre2/sgtk/swidgets/sactiveconsole.c
--- xscorch-0.2.1-pre2/sgtk/swidgets/sactiveconsole.c.newgtk	2009-04-26 19:39:52.000000000 +0200
+++ xscorch-0.2.1-pre2/sgtk/swidgets/sactiveconsole.c	2010-12-15 22:31:41.808088001 +0100
@@ -408,7 +408,7 @@ static void _sc_active_console_paint_reg
 
 static void _sc_active_console_enter_spot(ScActiveConsole *cons, gboolean forceenter) {
 
-   if(!forceenter && !GTK_WIDGET_HAS_FOCUS(GTK_WIDGET(cons))) {
+   if(!forceenter && !gtk_widget_has_focus(GTK_WIDGET(cons))) {
       return;
    }
    if(cons->current != NULL) {
@@ -421,7 +421,7 @@ static void _sc_active_console_enter_spo
 
 static void _sc_active_console_leave_spot(ScActiveConsole *cons, gboolean forceleave) {
 
-   if(!forceleave && !GTK_WIDGET_HAS_FOCUS(GTK_WIDGET(cons))) {
+   if(!forceleave && !gtk_widget_has_focus(GTK_WIDGET(cons))) {
       return;
    }
    if(cons->current != NULL) {
@@ -1282,7 +1282,7 @@ static void _sc_active_console_init_obj(
    cons->spots = NULL;
    cons->current = NULL;
 
-   GTK_WIDGET_SET_FLAGS(GTK_WIDGET(cons), GTK_CAN_DEFAULT);
+   gtk_widget_set_can_default(GTK_WIDGET(cons), TRUE);
    gtk_widget_set_events(GTK_WIDGET(cons), GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
 
 }
diff -up xscorch-0.2.1-pre2/sgtk/swidgets/sactoggle.c.newgtk xscorch-0.2.1-pre2/sgtk/swidgets/sactoggle.c
--- xscorch-0.2.1-pre2/sgtk/swidgets/sactoggle.c.newgtk	2009-04-26 19:39:52.000000000 +0200
+++ xscorch-0.2.1-pre2/sgtk/swidgets/sactoggle.c	2010-12-15 22:31:41.809088001 +0100
@@ -26,6 +26,7 @@
 #include <assert.h>
 #include <stdio.h>
 
+#define  __ALLOW_DEPRECATED_GDK__
 #include <sactoggle.h>
 
 #include <gdk/gdkkeysyms.h>
@@ -69,12 +70,12 @@ static void _sc_ac_toggle_draw(ScGadget 
    sc_gadget_get_extents(gadget, &bounds);
 
    /* Find out if this gadget has the focus right now. */
-   focus = (GTK_WIDGET_HAS_FOCUS(gadget->console) &&
+   focus = (gtk_widget_has_focus(GTK_WIDGET(gadget->console)) &&
             (gadget->console->current->data == gadget->spot))
            ? TRUE : FALSE;
 
    /* Find out if the gadget will be sensitive. */
-   sensitive = GTK_WIDGET_IS_SENSITIVE(GTK_WIDGET(gadget->console));
+   sensitive = gtk_widget_is_sensitive(GTK_WIDGET(gadget->console));
 
    /* Setup the GC colors for the toggle (drawing outer). */
    if(!sensitive)
diff -up xscorch-0.2.1-pre2/sgtk/swidgets/sdisplay.c.newgtk xscorch-0.2.1-pre2/sgtk/swidgets/sdisplay.c
--- xscorch-0.2.1-pre2/sgtk/swidgets/sdisplay.c.newgtk	2009-04-26 19:39:53.000000000 +0200
+++ xscorch-0.2.1-pre2/sgtk/swidgets/sdisplay.c	2010-12-15 22:31:41.810088001 +0100
@@ -31,7 +31,7 @@ static void _sc_display_init_obj(ScDispl
 
    assert(IS_SC_DISPLAY(dpy));
    dpy->draw = NULL;
-   GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(dpy), GTK_CAN_FOCUS);
+   gtk_widget_set_can_focus(GTK_WIDGET(dpy), FALSE);
    
 }
 
diff -up xscorch-0.2.1-pre2/sgtk/swidgets/sdrawbuf.c.newgtk xscorch-0.2.1-pre2/sgtk/swidgets/sdrawbuf.c
--- xscorch-0.2.1-pre2/sgtk/swidgets/sdrawbuf.c.newgtk	2009-04-26 19:39:53.000000000 +0200
+++ xscorch-0.2.1-pre2/sgtk/swidgets/sdrawbuf.c	2010-12-15 22:31:41.811088001 +0100
@@ -21,6 +21,7 @@
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 */
+#define  __ALLOW_DEPRECATED_GDK__
 #include <sdrawbuf.h>
 
 
@@ -116,7 +117,7 @@ static gint _sc_drawbuf_configure(GtkWid
 static gint _sc_drawbuf_expose(GtkWidget *widget, GdkEventExpose *event) {
 
    ScDrawbuf *draw = SC_DRAWBUF(widget);
-   GdkGC *fg_gc = widget->style->fg_gc[GTK_WIDGET_STATE((GtkWidget *)draw)];
+   GdkGC *fg_gc = widget->style->fg_gc[gtk_widget_get_state((GtkWidget *)draw)];
 
    /* Make sure buffer is allocated */
    g_return_val_if_fail(sc_drawbuf_get_buffer(draw) != NULL, TRUE);
@@ -156,7 +157,7 @@ static void _sc_drawbuf_init_obj(ScDrawb
    draw->style_configured = FALSE;
 
    /* Setup widget, and object signals */
-   GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(draw), GTK_CAN_FOCUS);
+   gtk_widget_set_can_focus(GTK_WIDGET(draw), FALSE);
    gtk_widget_add_events(GTK_WIDGET(draw), GDK_EXPOSURE_MASK);
    gtk_widget_set_app_paintable(GTK_WIDGET(draw), TRUE);
 
diff -up xscorch-0.2.1-pre2/sgtk/swindow-gtk.c.newgtk xscorch-0.2.1-pre2/sgtk/swindow-gtk.c
--- xscorch-0.2.1-pre2/sgtk/swindow-gtk.c.newgtk	2009-04-26 19:39:51.000000000 +0200
+++ xscorch-0.2.1-pre2/sgtk/swindow-gtk.c	2010-12-15 22:31:41.812088001 +0100
@@ -599,7 +599,6 @@ void sc_window_load_fonts(sc_window_gtk 
 
 void sc_window_unload_fonts(sc_window_gtk *w) {
 
-int i;
    assert(w != NULL);
 
    if(w->fixed_font != NULL)        gdk_font_unref(w->fixed_font);