--- a/dwt/internal/gtk/OS.d	Mon Jan 07 03:41:50 2008 +0100
+++ b/dwt/internal/gtk/OS.d	Mon Jan 07 07:47:32 2008 +0100
@@ -32,6 +32,36 @@
 private extern(C) GdkPixbuf* gdk_pixbuf_new (GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample,
                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);
+alias int Status;
+private extern(C) Status XRenderQueryVersion (Display *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;
+
+//struct Visual{}
+//private extern(C) Visual* gdk_x11_visual_get_xvisual(GdkVisual* visual);
+
+GdkDisplay* GDK_DISPLAY(){
+    return gtk_display;
+}
+
+XID GDK_PIXMAP_XID(GdkDrawable* win){
+    return gdk_x11_drawable_get_xid(win);
+}
+
+struct XErrorEvent {}
+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;
+
+extern (C) XIOErrorHandler XSetIOErrorHandler(XIOErrorHandler);
+extern (C) XErrorHandler XSetErrorHandler(XErrorHandler);
+
 
 template NameOfFunc(alias f) {
     // Note: highly dependent on the .stringof formatting
@@ -674,7 +704,9 @@
 //    mixin ForwardGtkOsCFunc!(.Call);
 //    mixin ForwardGtkOsCFunc!(.call );
     mixin ForwardGtkOsCFunc!(GDK_WINDOWING_X11);
+++/
     mixin ForwardGtkOsCFunc!(.GDK_PIXMAP_XID);
+/++
     mixin ForwardGtkOsCFunc!(.XCheckMaskEvent);
     mixin ForwardGtkOsCFunc!(.XCheckWindowEvent);
     mixin ForwardGtkOsCFunc!(.XCheckIfEvent);
@@ -689,10 +721,12 @@
     mixin ForwardGtkOsCFunc!(.XListProperties);
     mixin ForwardGtkOsCFunc!(.XReconfigureWMWindow);
     mixin ForwardGtkOsCFunc!(.XSendEvent);
+    +/
     mixin ForwardGtkOsCFunc!(.XSetIOErrorHandler);
     mixin ForwardGtkOsCFunc!(.XSetErrorHandler);
-    mixin ForwardGtkOsCFunc!(.XSetInputFocus);
+    //mixin ForwardGtkOsCFunc!(.XSetInputFocus);
     mixin ForwardGtkOsCFunc!(.XSynchronize);
+    /+
     mixin ForwardGtkOsCFunc!(.XTestFakeButtonEvent);
     mixin ForwardGtkOsCFunc!(.XTestFakeKeyEvent);
     mixin ForwardGtkOsCFunc!(.XTestFakeMotionEvent);
@@ -704,7 +738,9 @@
     mixin ForwardGtkOsCFunc!(.gdk_x11_drawable_get_xid);
     mixin ForwardGtkOsCFunc!(.gdk_x11_screen_lookup_visual);
     mixin ForwardGtkOsCFunc!(.gdk_x11_screen_get_window_manager_name);
+    +/
     mixin ForwardGtkOsCFunc!(.gdk_x11_visual_get_xvisual);
+    /+
     mixin ForwardGtkOsCFunc!(.gdk_pixmap_foreign_new);
     mixin ForwardGtkOsCFunc!(.gdk_window_lookup);
     mixin ForwardGtkOsCFunc!(.gdk_window_add_filter);
@@ -712,8 +748,10 @@
 
 /** X render natives and constants */
  //   mixin ForwardGtkOsCFunc!(XRenderPictureAttributes_sizeof);
+ +/
     mixin ForwardGtkOsCFunc!(.XRenderQueryExtension);
     mixin ForwardGtkOsCFunc!(.XRenderQueryVersion);
+    /+
     mixin ForwardGtkOsCFunc!(.XRenderCreatePicture);
     mixin ForwardGtkOsCFunc!(.XRenderSetPictureClipRectangles);
     mixin ForwardGtkOsCFunc!(.XRenderSetPictureTransform);
@@ -722,8 +760,8 @@
     mixin ForwardGtkOsCFunc!(.XRenderFindStandardFormat);
     mixin ForwardGtkOsCFunc!(.XRenderFindVisualFormat);
 //    mixin ForwardGtkOsCFunc!(Call );
+    +/
     mixin ForwardGtkOsCFunc!(.GDK_DISPLAY);
-    +/
     mixin ForwardGtkOsCFunc!(.GDK_ROOT_PARENT);
     /+
     mixin ForwardGtkOsCFunc!(.GDK_TYPE_COLOR);
@@ -926,7 +964,7 @@
     mixin ForwardGtkOsCFunc!(.gdk_keymap_translate_keyboard_state );
     mixin ForwardGtkOsCFunc!(.gdk_keyval_to_lower);
     mixin ForwardGtkOsCFunc!(.gdk_keyval_to_unicode);
-//    mixin ForwardGtkOsCFunc!(.gdk_pango_context_get);
+    mixin ForwardGtkOsCFunc!(.gdk_pango_context_get);
 //    mixin ForwardGtkOsCFunc!(.gdk_pango_context_set_colormap);
 //    mixin ForwardGtkOsCFunc!(.gdk_pango_layout_get_clip_region);
     mixin ForwardGtkOsCFunc!(.gdk_pixbuf_copy_area);
@@ -1112,7 +1150,7 @@
     mixin ForwardGtkOsCFunc!(.gtk_entry_text_index_to_layout_index );
     mixin ForwardGtkOsCFunc!(.gtk_entry_get_max_length);
     mixin ForwardGtkOsCFunc!(.gtk_entry_get_text);
-    //mixin ForwardGtkOsCFunc!(.FcConfigAppFontAddFile);
+    mixin ForwardGtkOsCFunc!(.FcConfigAppFontAddFile);
     mixin ForwardGtkOsCFunc!(.gtk_entry_get_visibility);
     mixin ForwardGtkOsCFunc!(.gtk_entry_new);
     mixin ForwardGtkOsCFunc!(.gtk_entry_set_activates_default);