--- a/dwt/internal/gtk/OS.d	Wed Jan 09 07:07:50 2008 +0100
+++ b/dwt/internal/gtk/OS.d	Thu Jan 10 02:18:07 2008 +0100
@@ -17,16 +17,184 @@
 import dwt.internal.Platform;
 import tango.core.Traits;
 
-import  dwt.internal.gtk.c.gtk,
-        dwt.internal.gtk.c.gdk,
-        dwt.internal.gtk.c.atk,
-        dwt.internal.gtk.c.glib,
-        dwt.internal.gtk.c.cairo,
-        dwt.internal.gtk.c.pango,
-        dwt.internal.gtk.c.gobject,
-        dwt.internal.gtk.c.gthread,
-        dwt.internal.gtk.c.gdkpixbuf;
+import  dwt.internal.c.gtk,
+        dwt.internal.c.gdk,
+        dwt.internal.c.gdkx,
+        dwt.internal.c.atk,
+        dwt.internal.c.glib,
+        dwt.internal.c.cairo,
+        dwt.internal.c.pango,
+        dwt.internal.c.pangocairo,
+        dwt.internal.c.gtk_unix_print_2_0,
+        dwt.internal.c.Xlib,
+        dwt.internal.c.XTest,
+        dwt.internal.c.Xrender,
+        dwt.internal.c.glib_object;
+
+public alias dwt.internal.c.glib_object.GPollFD GPollFD;
+public alias dwt.internal.c.glib_object.GClosure GClosure;
+public alias dwt.internal.c.glib_object.GList GList;
+public alias dwt.internal.c.glib_object.GObject GObject;
+public alias dwt.internal.c.glib_object.GTypeInfo GTypeInfo;
+public alias dwt.internal.c.glib_object.GCallback GCallback;
+public alias dwt.internal.c.glib_object.GClosureNotify GClosureNotify;
+public alias dwt.internal.c.glib_object.GPollFunc GPollFunc;
+
+public alias dwt.internal.c.gdk.GdkColor GdkColor;
+public alias dwt.internal.c.gdk.GdkRegion GdkRegion;
+public alias dwt.internal.c.gdk.GdkDrawable GdkDrawable;
+public alias dwt.internal.c.gdk.GdkGC GdkGC;
+public alias dwt.internal.c.gdk.GdkPixbuf GdkPixbuf;
+public alias dwt.internal.c.gdk.GdkCursor GdkCursor;
+public alias dwt.internal.c.gdk.GdkEvent GdkEvent;
+public alias dwt.internal.c.gdk.GdkEventKey GdkEventKey;
+public alias dwt.internal.c.gdk.GdkWindow GdkWindow;
+public alias dwt.internal.c.gdk.GdkEventButton GdkEventButton;
+public alias dwt.internal.c.gdk.GdkRectangle GdkRectangle;
+public alias dwt.internal.c.gdk.GdkEventExpose GdkEventExpose;
+public alias dwt.internal.c.gdk.GdkEventCrossing GdkEventCrossing;
+public alias dwt.internal.c.gdk.GdkEventMotion GdkEventMotion;
+public alias dwt.internal.c.gdk.GdkEventScroll GdkEventScroll;
+public alias dwt.internal.c.gdk.GdkEventVisibility GdkEventVisibility;
+public alias dwt.internal.c.gdk.GdkXEvent GdkXEvent;
+public alias dwt.internal.c.gdk.GdkPoint GdkPoint;
+public alias dwt.internal.c.gdk.GdkPixmap GdkPixmap;
+public alias dwt.internal.c.gdk.GdkBitmap GdkBitmap;
+public alias dwt.internal.c.gdk.GdkGCValues GdkGCValues;
+public alias dwt.internal.c.gdk.GdkDisplay GdkDisplay;
+public alias dwt.internal.c.gdk.GdkImage GdkImage;
+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.pango.PangoFontDescription PangoFontDescription;
+public alias dwt.internal.c.pango.PangoTabArray PangoTabArray;
+public alias dwt.internal.c.pango.PangoContext PangoContext;
+public alias dwt.internal.c.pango.PangoLayout PangoLayout;
+public alias dwt.internal.c.pango.PangoAttrList PangoAttrList;
+public alias dwt.internal.c.pango.PangoFontFamily PangoFontFamily;
+public alias dwt.internal.c.pango.PangoFontFace PangoFontFace;
+public alias dwt.internal.c.pango.PangoRectangle PangoRectangle;
+public alias dwt.internal.c.pango.PangoAttribute PangoAttribute;
+public alias dwt.internal.c.pango.PangoLogAttr PangoLogAttr;
+public alias dwt.internal.c.pango.PangoItem PangoItem;
+public alias dwt.internal.c.pango.PangoLayoutRun PangoLayoutRun;
+public alias dwt.internal.c.pango.PangoLayoutLine PangoLayoutLine;
+
+public alias dwt.internal.c.cairo.cairo_t cairo_t;
+public alias dwt.internal.c.cairo.cairo_pattern_t cairo_pattern_t;
+public alias dwt.internal.c.cairo.cairo_surface_t cairo_surface_t;
+public alias dwt.internal.c.cairo.cairo_text_extents_t cairo_text_extents_t;
+public alias dwt.internal.c.cairo.cairo_font_extents_t cairo_font_extents_t;
+public alias dwt.internal.c.cairo.cairo_matrix_t cairo_matrix_t;
+public alias dwt.internal.c.cairo.cairo_path_t cairo_path_t;
+public alias dwt.internal.c.cairo.cairo_path_data_t cairo_path_data_t;
 
+public alias dwt.internal.c.gtk.GtkWidget GtkWidget;
+public alias dwt.internal.c.gtk.GtkIMContext GtkIMContext;
+public alias dwt.internal.c.gtk.GtkStyle GtkStyle;
+public alias dwt.internal.c.gtk.GtkRcStyle GtkRcStyle;
+public alias dwt.internal.c.gtk.GtkCellRenderer GtkCellRenderer;
+public alias dwt.internal.c.gtk.GtkScrolledWindow GtkScrolledWindow;
+public alias dwt.internal.c.gtk.GtkLabel GtkLabel;
+public alias dwt.internal.c.gtk.GtkWindow GtkWindow;
+public alias dwt.internal.c.gtk.GtkRequisition GtkRequisition;
+public alias dwt.internal.c.gtk.GtkContainer GtkContainer;
+public alias dwt.internal.c.gtk.GtkAdjustment GtkAdjustment;
+public alias dwt.internal.c.gtk.GtkCallback GtkCallback;
+public alias dwt.internal.c.gtk.GtkFixedClass GtkFixedClass;
+public alias dwt.internal.c.gtk.GtkFixed GtkFixed;
+public alias dwt.internal.c.gtk.GtkCellRendererText GtkCellRendererText;
+public alias dwt.internal.c.gtk.GtkCellRendererTextClass GtkCellRendererTextClass;
+public alias dwt.internal.c.gtk.GtkCellRendererPixbufClass GtkCellRendererPixbufClass;
+public alias dwt.internal.c.gtk.GtkCellRendererPixbuf GtkCellRendererPixbuf;
+public alias dwt.internal.c.gtk.GtkCellRendererToggleClass GtkCellRendererToggleClass;
+public alias dwt.internal.c.gtk.GtkCellRendererToggle GtkCellRendererToggle;
+public alias dwt.internal.c.gtk.GtkWidgetClass GtkWidgetClass;
+public alias dwt.internal.c.gtk.GtkCellRendererClass GtkCellRendererClass;
+public alias dwt.internal.c.gtk.GtkAllocation GtkAllocation;
+
+public alias dwt.internal.c.Xlib.XErrorEvent XErrorEvent;
+public alias dwt.internal.c.Xlib.XExposeEvent XExposeEvent;
+public alias dwt.internal.c.Xlib.XVisibilityEvent XVisibilityEvent;
+public alias dwt.internal.c.Xlib.XEvent XEvent;
+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.Xrender.XRenderPictureAttributes XRenderPictureAttributes;
+public alias dwt.internal.c.Xrender.XTransform XTransform;
+
+
+// function with variadic argument list
+private void gtk_widget_style_get1( GtkWidget* widget, gchar* firstPropertyName, int* res ){
+    gtk_widget_style_get( widget, firstPropertyName, res, null );
+}
+// function with variadic argument list
+private void g_object_get1( void* obj, gchar* firstPropertyName, int* res ){
+    g_object_get( obj, firstPropertyName, res, null );
+}
+
+// for linux always true, the other possibility would be GDK_WINDOWING_WIN32
+private bool GDK_WINDOWING_X11(){
+    return true;
+}
+
+private uint GDK_PIXMAP_XID(GdkDrawable* win){
+    return gdk_x11_drawable_get_xid(win);
+}
+
+// macro
+int g_signal_connect( void* instance, char* sig, GCallback handle, void* ptr ){
+    return g_signal_connect_data( instance, sig, handle, ptr, cast(GClosureNotify) 0, cast(GConnectFlags)0 );
+}
+
+// macro
+void gdk_cursor_destroy( GdkCursor* cursor ){
+    gdk_cursor_unref(cursor);
+}
+
+int g_thread_supported(){
+    return g_threads_got_initialized;
+}
+
+
+private int PANGO_PIXELS( int v );
+private GdkWindow* GDK_ROOT_PARENT();
+private GdkDisplay* GDK_DISPLAY();
+private GType GTK_TYPE_FIXED();
+private GType GTK_TYPE_CELL_RENDERER_TEXT();
+private GType GTK_TYPE_CELL_RENDERER_PIXBUF();
+private GType GTK_TYPE_CELL_RENDERER_TOGGLE();
+private bool GTK_IS_WINDOW(GtkWidget *);
+private bool GTK_IS_CONTAINER(GtkWidget*);
+private GType GTK_TYPE_MENU();
+private GType GTK_TYPE_WIDGET();
+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( GObject* );
+private GType G_TYPE_STRING();
+
+// fontconfig.h
+struct FcConfig{};
+private extern(C) int FcConfigAppFontAddFile (FcConfig *config, char  *file);
+
+
+
+/++++
 // temporary added, because was not yet available
 struct XAnyEvent {
     int type;
@@ -157,13 +325,6 @@
 }
 
 
-//void function(GtkWidget* widget, gchar* firstPropertyName, ... )gtk_widget_style_get;
-private void gtk_widget_style_get1( GtkWidget* widget, gchar* firstPropertyName, int* res ){
-    gtk_widget_style_get( widget, firstPropertyName, res, null );
-}
-private void g_object_get1( void* obj, gchar* firstPropertyName, int* res ){
-    g_object_get( obj, firstPropertyName, res, null );
-}
 
 
 private extern(C) PangoLayout *pango_cairo_create_layout (cairo_t     *cr);
@@ -192,8 +353,6 @@
 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( void* ) XSynchronizeResult;
 private extern(C) XSynchronizeResult function( void*, int ) XSynchronize;
@@ -201,7 +360,6 @@
 //struct Visual{}
 //private extern(C) Visual* gdk_x11_visual_get_xvisual(GdkVisual* visual);
 
-private extern (C) GdkDisplay* GDK_DISPLAY();
 
 private extern (C) XID GDK_PIXMAP_XID(GdkDrawable* win);
 struct XErrorEvent {}
@@ -214,31 +372,6 @@
 private extern (C) XIOErrorHandler XSetIOErrorHandler(XIOErrorHandler);
 private extern (C) XErrorHandler XSetErrorHandler(XErrorHandler);
 private extern (C) int PANGO_PIXELS( int v );
-private GType GTK_TYPE_FIXED();
-private GType GTK_TYPE_CELL_RENDERER_TEXT();
-private GType GTK_TYPE_CELL_RENDERER_PIXBUF();
-private GType GTK_TYPE_CELL_RENDERER_TOGGLE();
-private bool GTK_IS_WINDOW(GtkWidget *);
-private bool GTK_IS_CONTAINER(GtkWidget*);
-private GType GTK_TYPE_MENU();
-private GType GTK_TYPE_WIDGET();
-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( GObject* );
-private GType G_TYPE_STRING();
 private char* gdk_x11_screen_get_window_manager_name(GdkScreen*);
 private char XKeysymToKeycode(void *, uint);
 private int XTestFakeKeyEvent(void *, uint, int, uint);
@@ -246,9 +379,8 @@
 int XTestFakeButtonEvent(void *, uint, int, uint);
 uint XDefaultRootWindow(void *);
 int XWarpPointer(void *, uint, uint, int, int, uint, uint, int, int);
-int g_signal_connect( void* instance, char* sig, GCallback handle, void* ptr ){
-    return g_signal_connect_data( instance, sig, handle, ptr, cast(GClosureNotify) 0, cast(GConnectFlags)0 );
-}
+++++/
+
 template NameOfFunc(alias f) {
     // Note: highly dependent on the .stringof formatting
     // the value begins with "& " which is why the first two chars are cut off
@@ -275,7 +407,6 @@
   }");
 }
 +/
-
 //import dwt.internal.*;
 
 public class OS : Platform {