--- a/dwt/internal/gtk/OS.d	Thu Jan 10 05:17:47 2008 +0100
+++ b/dwt/internal/gtk/OS.d	Thu Jan 10 07:33:15 2008 +0100
@@ -66,6 +66,7 @@
 public alias dwt.internal.c.gdk.GdkEventAny GdkEventAny;
 public alias dwt.internal.c.gdk.GdkEventFocus GdkEventFocus;
 public alias dwt.internal.c.gdk.GdkWindowAttr GdkWindowAttr;
+public alias dwt.internal.c.gdk.GdkEventWindowState GdkEventWindowState;
 
 public alias dwt.internal.c.pango.PangoFontDescription PangoFontDescription;
 public alias dwt.internal.c.pango.PangoTabArray PangoTabArray;
@@ -115,6 +116,7 @@
 public alias dwt.internal.c.gtk.GtkAllocation GtkAllocation;
 public alias dwt.internal.c.gtk.GtkSocket GtkSocket;
 public alias dwt.internal.c.gtk.GtkAccelGroup GtkAccelGroup;
+public alias dwt.internal.c.gtk.GtkTooltips GtkTooltips;
 
 public alias dwt.internal.c.Xlib.XErrorEvent XErrorEvent;
 public alias dwt.internal.c.Xlib.XExposeEvent XExposeEvent;
@@ -123,6 +125,7 @@
 public alias dwt.internal.c.Xlib.XRectangle XRectangle;
 public alias dwt.internal.c.Xlib.XButtonEvent XButtonEvent;
 public alias dwt.internal.c.Xlib.XWindowChanges XWindowChanges;
+public alias dwt.internal.c.Xlib.XFocusChangeEvent XFocusChangeEvent;
 
 public alias dwt.internal.c.Xrender.XRenderPictureAttributes XRenderPictureAttributes;
 public alias dwt.internal.c.Xrender.XTransform XTransform;
@@ -170,6 +173,7 @@
 private GType GTK_TYPE_CELL_RENDERER_TOGGLE();
 private bool GTK_IS_WINDOW(GtkWidget *);
 private bool GTK_IS_CONTAINER(GtkWidget*);
+private int  GTK_IS_PLUG(GtkWidget*);
 private GType GTK_TYPE_MENU();
 private GType GTK_TYPE_WIDGET();
 private GType GTK_WIDGET_FLAGS(GtkWidget*);
@@ -1060,7 +1064,7 @@
 
     mixin ForwardGtkOsCFunc!(.XSetIOErrorHandler);
     mixin ForwardGtkOsCFunc!(.XSetErrorHandler);
-    //mixin ForwardGtkOsCFunc!(.XSetInputFocus);
+    mixin ForwardGtkOsCFunc!(.XSetInputFocus);
     mixin ForwardGtkOsCFunc!(.XSynchronize);
     mixin ForwardGtkOsCFunc!(.XTestFakeButtonEvent);
     mixin ForwardGtkOsCFunc!(.XTestFakeKeyEvent);
@@ -1079,7 +1083,7 @@
 //     mixin ForwardGtkOsCFunc!(.gdk_pixmap_foreign_new);
     mixin ForwardGtkOsCFunc!(.gdk_window_lookup);
     mixin ForwardGtkOsCFunc!(.gdk_window_add_filter);
-//     mixin ForwardGtkOsCFunc!(.gdk_window_remove_filter);
+    mixin ForwardGtkOsCFunc!(.gdk_window_remove_filter);
 
 /** X render natives and constants */
  //   mixin ForwardGtkOsCFunc!(XRenderPictureAttributes_sizeof);
@@ -1105,7 +1109,7 @@
 //     mixin ForwardGtkOsCFunc!(.GTK_IS_CELL_RENDERER_TOGGLE);
      mixin ForwardGtkOsCFunc!(.GTK_IS_CONTAINER);
 //     mixin ForwardGtkOsCFunc!(.GTK_IS_IMAGE_MENU_ITEM);
-//     mixin ForwardGtkOsCFunc!(.GTK_IS_PLUG);
+     mixin ForwardGtkOsCFunc!(.GTK_IS_PLUG);
 //     mixin ForwardGtkOsCFunc!(.GTK_STOCK_CANCEL);
 //     mixin ForwardGtkOsCFunc!(.GTK_STOCK_OK);
      mixin ForwardGtkOsCFunc!(.GTK_TYPE_CELL_RENDERER_TEXT);
@@ -2174,12 +2178,10 @@
          { return arg0.type; }
     static GdkWindow* GDK_EVENT_WINDOW( GdkEventAny* arg0 )
          { return arg0.window; }
-/+
-    int  X_EVENT_TYPE( XEvent* arg0 )
+    static int  X_EVENT_TYPE( XEvent* arg0 )
          { return arg0.type; }
-    Window X_EVENT_WINDOW( XAnyEvent* arg0 )
-         { return arg0.window; }
-    +/
+    //Window X_EVENT_WINDOW( XAnyEvent* arg0 )
+    //     { return arg0.window; }
 
     //g_list_data(arg0) (arg0)->data
     static void* g_list_data( GList* arg0 ) {