--- a/dwt/internal/gtk/OS.d	Wed Jan 09 03:05:22 2008 +0100
+++ b/dwt/internal/gtk/OS.d	Wed Jan 09 06:17:26 2008 +0100
@@ -120,7 +120,15 @@
     uint button;
     int same_screen;
 }
-
+struct XWindowChanges {
+int x;
+int y;
+int width;
+int height;
+int border_width;
+uint sibling;
+int stack_mode;
+}
 private extern (C){
     GdkWindow * gdk_window_lookup(uint);
     uint                XRenderCreatePicture(void *, uint, XRenderPictFormat *, uint, XRenderPictureAttributes *);
@@ -143,6 +151,9 @@
 
     void * gdk_atom_intern(char *, int);
     int gdk_property_get(GdkDrawable *, void *, void *, uint, uint, int, void **, int *, int *, char ** );
+    void * gdk_x11_drawable_get_xdisplay(GdkDrawable *);
+    int XDefaultScreen(void *);
+    int XReconfigureWMWindow(void *, uint, int, uint, XWindowChanges *);
 }
 
 
@@ -211,22 +222,22 @@
 private bool GTK_IS_CONTAINER(GtkWidget*);
 private GType GTK_TYPE_MENU();
 private GType GTK_TYPE_WIDGET();
-private GType GTK_WIDGET_FLAGS();
-private GType GTK_WIDGET_STATE();
-private GType GTK_WIDGET_HAS_DEFAULT();
-private GType GTK_WIDGET_HAS_FOCUS();
-private GType GTK_WIDGET_IS_SENSITIVE();
-private GType GTK_WIDGET_MAPPED();
-private GType GTK_WIDGET_SENSITIVE();
-private GType GTK_WIDGET_SET_FLAGS();
-private GType GTK_WIDGET_UNSET_FLAGS();
-private GType GTK_WIDGET_VISIBLE();
+private GType GTK_WIDGET_FLAGS(GtkWidget*);
+private GType GTK_WIDGET_STATE(GtkWidget*);
+private GType GTK_WIDGET_HAS_DEFAULT(GtkWidget*);
+private GType GTK_WIDGET_HAS_FOCUS(GtkWidget*);
+private GType GTK_WIDGET_IS_SENSITIVE(GtkWidget*);
+private GType GTK_WIDGET_MAPPED(GtkWidget*);
+private GType GTK_WIDGET_SENSITIVE(GtkWidget*);
+private void GTK_WIDGET_SET_FLAGS(GtkWidget*, int);
+private void GTK_WIDGET_UNSET_FLAGS(GtkWidget*, int);
+private bool GTK_WIDGET_VISIBLE(GtkWidget*);
 private GType G_OBJECT_CLASS ();
 private GType G_OBJECT_GET_CLASS ();
 private GType G_OBJECT_TYPE_NAME ();
 private GType G_TYPE_BOOLEAN();
 private GType G_TYPE_INT();
-private GType G_OBJECT_TYPE( );
+private GType G_OBJECT_TYPE( GObject* );
 private GType G_TYPE_STRING();
 private char* gdk_x11_screen_get_window_manager_name(GdkScreen*);
 private char XKeysymToKeycode(void *, uint);
@@ -901,8 +912,8 @@
 
 //     mixin ForwardGtkOsCFunc!(.XCheckMaskEvent);
 //     mixin ForwardGtkOsCFunc!(.XCheckWindowEvent);
-     mixin ForwardGtkOsCFunc!(.XCheckIfEvent);
-//     mixin ForwardGtkOsCFunc!(.XDefaultScreen);
+    mixin ForwardGtkOsCFunc!(.XCheckIfEvent);
+    mixin ForwardGtkOsCFunc!(.XDefaultScreen);
     mixin ForwardGtkOsCFunc!(.XDefaultRootWindow);
     mixin ForwardGtkOsCFunc!(.XFlush);
 //     mixin ForwardGtkOsCFunc!(.XFree);
@@ -911,7 +922,7 @@
 //     mixin ForwardGtkOsCFunc!(.XQueryTree);
      mixin ForwardGtkOsCFunc!(.XKeysymToKeycode);
 //     mixin ForwardGtkOsCFunc!(.XListProperties);
-//     mixin ForwardGtkOsCFunc!(.XReconfigureWMWindow);
+     mixin ForwardGtkOsCFunc!(.XReconfigureWMWindow);
 //     mixin ForwardGtkOsCFunc!(.XSendEvent);
 
     mixin ForwardGtkOsCFunc!(.XSetIOErrorHandler);
@@ -926,8 +937,8 @@
 
     mixin ForwardGtkOsCFunc!(.gdk_x11_atom_to_xatom);
     mixin ForwardGtkOsCFunc!(.gdk_x11_colormap_get_xcolormap);
+    +/
     mixin ForwardGtkOsCFunc!(.gdk_x11_drawable_get_xdisplay);
-    +/
     mixin ForwardGtkOsCFunc!(.gdk_x11_drawable_get_xid);
     //mixin ForwardGtkOsCFunc!(.gdk_x11_screen_lookup_visual);
     mixin ForwardGtkOsCFunc!(.gdk_x11_screen_get_window_manager_name);
@@ -1011,12 +1022,12 @@
     mixin ForwardGtkOsCFunc!(.g_free);
     mixin ForwardGtkOsCFunc!(.g_idle_add);
     mixin ForwardGtkOsCFunc!(.g_list_append);
-//    mixin ForwardGtkOsCFunc!(.g_list_data);
+    //mixin ForwardGtkOsCFunc!(.g_list_data); // macro impl
     mixin ForwardGtkOsCFunc!(.g_list_free);
     mixin ForwardGtkOsCFunc!(.g_list_free_1);
     mixin ForwardGtkOsCFunc!(.g_list_length);
 //   mixin ForwardGtkOsCFunc!(.g_list_set_next);
-//   mixin ForwardGtkOsCFunc!(.g_list_next);
+    //mixin ForwardGtkOsCFunc!(.g_list_next);
     mixin ForwardGtkOsCFunc!(.g_list_nth);
     mixin ForwardGtkOsCFunc!(.g_list_nth_data);
     mixin ForwardGtkOsCFunc!(.g_list_prepend);
@@ -1992,33 +2003,33 @@
                   (cast(GtkScrolledWindowClass*) ((cast(GTypeInstance*) arg0).g_class)).scrollbar_spacing : 3) ;
     }
 
-    int  GTK_WIDGET_HEIGHT( GtkWidget* arg0 )
+    static int  GTK_WIDGET_HEIGHT( GtkWidget* arg0 )
          { return arg0.allocation.height; }
-    void GTK_WIDGET_SET_HEIGHT( GtkWidget* arg0, int arg1)
+    static void GTK_WIDGET_SET_HEIGHT( GtkWidget* arg0, int arg1)
          { arg0.allocation.height = arg1; }
-    int  GTK_WIDGET_WIDTH( GtkWidget* arg0)
+    static int  GTK_WIDGET_WIDTH( GtkWidget* arg0)
          { return arg0.allocation.width; }
-    void GTK_WIDGET_SET_WIDTH( GtkWidget* arg0, int arg1)
+    static void GTK_WIDGET_SET_WIDTH( GtkWidget* arg0, int arg1)
          { arg0.allocation.width = arg1; }
-    GdkWindow* GTK_WIDGET_WINDOW( GtkWidget* arg0)
+    static GdkWindow* GTK_WIDGET_WINDOW( GtkWidget* arg0)
          { return arg0.window; }
-    int  GTK_WIDGET_X( GtkWidget* arg0 )
+    static int  GTK_WIDGET_X( GtkWidget* arg0 )
          { return arg0.allocation.x; }
-    void GTK_WIDGET_SET_X( GtkWidget* arg0, int arg1)
+    static void GTK_WIDGET_SET_X( GtkWidget* arg0, int arg1)
          { arg0.allocation.x = arg1; }
-    int  GTK_WIDGET_Y( GtkWidget* arg0 )
+    static int  GTK_WIDGET_Y( GtkWidget* arg0 )
          { return arg0.allocation.y; }
-    void GTK_WIDGET_SET_Y( GtkWidget* arg0, int arg1)
+    static void GTK_WIDGET_SET_Y( GtkWidget* arg0, int arg1)
          { arg0.allocation.y = arg1; }
-    int  GTK_WIDGET_REQUISITION_WIDTH( GtkWidget* arg0 )
+    static int  GTK_WIDGET_REQUISITION_WIDTH( GtkWidget* arg0 )
          { return arg0.requisition.width;  }
-    int  GTK_WIDGET_REQUISITION_HEIGHT( GtkWidget* arg0 )
+    static int  GTK_WIDGET_REQUISITION_HEIGHT( GtkWidget* arg0 )
          { return arg0.requisition.height; }
 
-    GtkIMContext* GTK_ENTRY_IM_CONTEXT( GtkEntry* arg0 )
+    static GtkIMContext* GTK_ENTRY_IM_CONTEXT( GtkEntry* arg0 )
          { return arg0.im_context; }
 
-    GtkIMContext* GTK_TEXTVIEW_IM_CONTEXT( GtkTextView* arg0)
+    static GtkIMContext* GTK_TEXTVIEW_IM_CONTEXT( GtkTextView* arg0)
          { return arg0.im_context; }
 
     static GtkWidget* GTK_TOOLTIPS_TIP_WINDOW( GtkTooltips* arg0)
@@ -2035,12 +2046,28 @@
          { return arg0.type; }
     Window X_EVENT_WINDOW( XAnyEvent* arg0 )
          { return arg0.window; }
+    +/
 
-    g_list_data(arg0) (arg0)->data
-    g_slist_data(arg0) (arg0)->data
-    g_list_set_next(arg0, arg1) (arg0)->next = arg1
-    g_list_set_previous(arg0, arg1) (arg0)->prev = arg1
-    +/
+    //g_list_data(arg0) (arg0)->data
+    static void* g_list_data( GList* arg0 ) {
+        return arg0.data;
+    }
+    //g_list_next(list) ((list) ? (((GList *)(list))->next) : NULL)
+    static void* g_list_next( GList* list ) {
+        return list ? list.next : null;
+    }
+    //g_slist_data(arg0) (arg0)->data
+    //g_list_set_next(arg0, arg1) (arg0)->next = arg1
+    //g_list_set_previous(arg0, arg1) (arg0)->prev = arg1
+
+
+
+
+
+
+
+
+
 
     //gtk_rc_style_get_bg_pixmap_name(arg0, arg1) (arg0)->bg_pixmap_name[arg1]
     static char* gtk_rc_style_get_bg_pixmap_name( GtkRcStyle* arg0, int arg1 ) {