--- a/dwt/internal/gtk/OS.d	Sun Jan 13 23:50:55 2008 +0100
+++ b/dwt/internal/gtk/OS.d	Mon Jan 14 02:04:54 2008 +0100
@@ -155,6 +155,14 @@
 public alias dwt.internal.c.gtk.GtkRange GtkRange;
 public alias dwt.internal.c.gtk.GtkSpinButton GtkSpinButton;
 public alias dwt.internal.c.gtk.GtkFrame GtkFrame;
+public alias dwt.internal.c.gtk.GtkTreeIter GtkTreeIter;
+public alias dwt.internal.c.gtk.GtkTreeStore GtkTreeStore;
+public alias dwt.internal.c.gtk.GtkListStore GtkListStore;
+public alias dwt.internal.c.gtk.GtkTreeViewColumn GtkTreeViewColumn;
+public alias dwt.internal.c.gtk.GtkTreeView GtkTreeView;
+public alias dwt.internal.c.gtk.GtkTreePath GtkTreePath;
+public alias dwt.internal.c.gtk.GtkTreeSelection GtkTreeSelection;
+public alias dwt.internal.c.gtk.GtkTreeModel GtkTreeModel;
 
 public alias dwt.internal.c.Xlib.XErrorEvent XErrorEvent;
 public alias dwt.internal.c.Xlib.XExposeEvent XExposeEvent;
@@ -198,6 +206,14 @@
     g_signal_emit_by_name( instance, detailed_signal, value1, value2, value3 );
 }
 
+private void gtk_list_store_set1(GtkListStore * store , GtkTreeIter * iter, int column, void* value ){
+    gtk_list_store_set( store, iter, column, value, -1 );
+}
+
+private void gtk_tree_model_get1(GtkTreeModel * store , GtkTreeIter * iter, int column, void** value ){
+    gtk_tree_model_get( store, iter, column, value, -1 );
+}
+
 // for linux always true, the other possibility would be GDK_WINDOWING_WIN32
 private bool GDK_WINDOWING_X11(){
     return true;
@@ -211,7 +227,6 @@
 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);
@@ -1332,11 +1347,7 @@
     mixin ForwardGtkOsCFunc!(.gtk_list_store_insert);
     mixin ForwardGtkOsCFunc!(.gtk_list_store_newv);
     mixin ForwardGtkOsCFunc!(.gtk_list_store_remove);
-    mixin ForwardGtkOsCFunc!(.gtk_list_store_set);
-    mixin ForwardGtkOsCFunc!(.gtk_list_store_set);
-    mixin ForwardGtkOsCFunc!(.gtk_list_store_set);
-    mixin ForwardGtkOsCFunc!(.gtk_list_store_set);
-    mixin ForwardGtkOsCFunc!(.gtk_list_store_set);
+    mixin ForwardGtkOsCFunc!(.gtk_list_store_set1);
     mixin ForwardGtkOsCFunc!(.gtk_main);
     mixin ForwardGtkOsCFunc!(.gtk_main_iteration);
     mixin ForwardGtkOsCFunc!(.gtk_main_do_event);
@@ -1572,8 +1583,7 @@
     mixin ForwardGtkOsCFunc!(.gtk_tooltips_new);
     mixin ForwardGtkOsCFunc!(.gtk_tooltips_force_window);
     mixin ForwardGtkOsCFunc!(.gtk_tooltips_set_tip);
-    mixin ForwardGtkOsCFunc!(.gtk_tree_model_get);
-    mixin ForwardGtkOsCFunc!(.gtk_tree_model_get);
+    mixin ForwardGtkOsCFunc!(.gtk_tree_model_get1);
     mixin ForwardGtkOsCFunc!(.gtk_tree_model_get_iter);
     mixin ForwardGtkOsCFunc!(.gtk_tree_model_get_iter_first);
     mixin ForwardGtkOsCFunc!(.gtk_tree_model_get_n_columns);
@@ -1592,7 +1602,6 @@
     mixin ForwardGtkOsCFunc!(.gtk_tree_path_new);
     mixin ForwardGtkOsCFunc!(.gtk_tree_path_new_first);
     mixin ForwardGtkOsCFunc!(.gtk_tree_path_new_from_string);
-    mixin ForwardGtkOsCFunc!(.gtk_tree_path_new_from_string);
     mixin ForwardGtkOsCFunc!(.gtk_tree_path_next);
     mixin ForwardGtkOsCFunc!(.gtk_tree_path_prev);
     mixin ForwardGtkOsCFunc!(.gtk_tree_path_up);