--- a/dwt/internal/gtk/OS.d	Wed Jan 09 01:08:22 2008 +0100
+++ b/dwt/internal/gtk/OS.d	Wed Jan 09 02:59:32 2008 +0100
@@ -124,8 +124,8 @@
 private extern (C){
     GdkWindow * gdk_window_lookup(uint);
     uint                XRenderCreatePicture(void *, uint, XRenderPictFormat *, uint, XRenderPictureAttributes *);
-    XRenderPictFormat * XRenderFindStandardFormat (dwt.internal.gtk.c.cairotypes.Display *dpy, int format);
-    XRenderPictFormat * XRenderFindVisualFormat (dwt.internal.gtk.c.cairotypes.Display *dpy, void *visual);
+    XRenderPictFormat * XRenderFindStandardFormat (void *dpy, int format);
+    XRenderPictFormat * XRenderFindVisualFormat (void *dpy, void *visual);
     void XRenderSetPictureTransform (void     *dpy,uint picture, XTransform *transform);
     void XRenderSetPictureClipRectangles(void *, uint, int, int, XRectangle *, int);
     void XRenderFreePicture(void *, uint);
@@ -176,16 +176,16 @@
                int width, int height);
 
 private extern(C) PangoContext *gdk_pango_context_get();
-private extern(C) int XRenderQueryExtension (Display *dpy, int *event_basep, int *error_basep);
+private extern(C) int XRenderQueryExtension (void *dpy, int *event_basep, int *error_basep);
 alias int Status;
-private extern(C) Status XRenderQueryVersion (Display *dpy,
+private extern(C) Status XRenderQueryVersion (void *dpy,
                 int     *major_versionp,
                 int     *minor_versionp);
 struct FcConfig{};
 private extern(C) int FcConfigAppFontAddFile (FcConfig *config, char  *file);
 
-alias extern(C) int function( dwt.internal.gtk.c.cairotypes.Display* ) XSynchronizeResult;
-private extern(C) XSynchronizeResult function( dwt.internal.gtk.c.cairotypes.Display*, int ) XSynchronize;
+alias extern(C) int function( void* ) XSynchronizeResult;
+private extern(C) XSynchronizeResult function( void*, int ) XSynchronize;
 
 //struct Visual{}
 //private extern(C) Visual* gdk_x11_visual_get_xvisual(GdkVisual* visual);
@@ -197,8 +197,8 @@
 
 private extern (C) bool GDK_WINDOWING_X11();
 private extern (C) int XFlush(void *);
-public alias extern(C) int function(dwt.internal.gtk.c.cairotypes.Display*) XIOErrorHandler;
-public alias extern(C) int function(dwt.internal.gtk.c.cairotypes.Display*, XErrorEvent *) XErrorHandler;
+public alias extern(C) int function(void*) XIOErrorHandler;
+public alias extern(C) int function(void*, XErrorEvent *) XErrorHandler;
 
 private extern (C) XIOErrorHandler XSetIOErrorHandler(XIOErrorHandler);
 private extern (C) XErrorHandler XSetErrorHandler(XErrorHandler);
@@ -2040,16 +2040,39 @@
     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]
-    gtk_rc_style_get_color_flags(arg0, arg1) (arg0)->color_flags[arg1]
-    gtk_rc_style_set_bg(arg0, arg1, arg2) if (arg2) (arg0)->bg[arg1] = *arg2
-    gtk_rc_style_set_bg_pixmap_name(arg0, arg1, arg2) (arg0)->bg_pixmap_name[arg1] = (char *)arg2
-    gtk_rc_style_set_color_flags(arg0, arg1, arg2) (arg0)->color_flags[arg1] = arg2
-    gtk_rc_style_set_fg(arg0, arg1, arg2) if (arg2) (arg0)->fg[arg1] = *arg2
-    gtk_rc_style_set_text(arg0, arg1, arg2) if (arg2) (arg0)->text[arg1] = *arg2
+    //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 ) {
+        return arg0.bg_pixmap_name[arg1];
+    }
+    //gtk_rc_style_get_color_flags(arg0, arg1) (arg0)->color_flags[arg1]
+    static int gtk_rc_style_get_color_flags( GtkRcStyle* arg0, int arg1 ) {
+        return arg0.color_flags[arg1];
+    }
+    //gtk_rc_style_set_bg(arg0, arg1, arg2) if (arg2) (arg0)->bg[arg1] = *arg2
+    static void gtk_rc_style_set_bg( GtkRcStyle* arg0, int arg1, GdkColor* arg2 ) {
+        if (arg2) arg0.bg[arg1] = *arg2;
+    }
+    //gtk_rc_style_set_bg_pixmap_name(arg0, arg1, arg2) (arg0)->bg_pixmap_name[arg1] = (char *)arg2
+    static void gtk_rc_style_set_bg_pixmap_name( GtkRcStyle* arg0, int arg1, char* arg2 ) {
+        arg0.bg_pixmap_name[arg1] = arg2;
+    }
 
-    +/
+    //gtk_rc_style_set_color_flags(arg0, arg1, arg2) (arg0)->color_flags[arg1] = arg2
+    static void gtk_rc_style_set_color_flags( GtkRcStyle* arg0, int arg1, int arg2 ) {
+        arg0.color_flags[arg1] = arg2;
+    }
+
+    //gtk_rc_style_set_fg(arg0, arg1, arg2) if (arg2) (arg0)->fg[arg1] = *arg2
+    static void gtk_rc_style_set_fg( GtkRcStyle* arg0, int arg1, GdkColor* arg2 ) {
+        if (arg2) arg0.fg[arg1] = *arg2;
+    }
+    //gtk_rc_style_set_text(arg0, arg1, arg2) if (arg2) (arg0)->text[arg1] = *arg2
+    static void gtk_rc_style_set_text( GtkRcStyle* arg0, int arg1, GdkColor* arg2 ) {
+        if (arg2) arg0.text[arg1] = *arg2;
+    }
+
     //gtk_style_get_font_desc(arg0) (arg0)->font_desc
     static PangoFontDescription* gtk_style_get_font_desc( GtkStyle* arg0 ) {
         return arg0.font_desc;