--- a/dwt/internal/gtk/OS.d	Sat Jan 12 08:44:23 2008 +0100
+++ b/dwt/internal/gtk/OS.d	Sat Jan 12 11:16:09 2008 +0100
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.
  * The contents of this file are made available under the terms
  * of the GNU Lesser General Public License (LGPL) Version 2.1 that
@@ -145,6 +145,13 @@
 public alias dwt.internal.c.gtk.GtkMenuItem GtkMenuItem;
 public alias dwt.internal.c.gtk.GtkIMMulticontext GtkIMMulticontext;
 public alias dwt.internal.c.gtk.GtkTooltipsData GtkTooltipsData;
+public alias dwt.internal.c.gtk.GtkTextIter GtkTextIter;
+public alias dwt.internal.c.gtk.GtkEntry GtkEntry;
+public alias dwt.internal.c.gtk.GtkEditable GtkEditable;
+public alias dwt.internal.c.gtk.GtkTextView GtkTextView;
+public alias dwt.internal.c.gtk.GtkTextBuffer GtkTextBuffer;
+
+
 
 public alias dwt.internal.c.Xlib.XErrorEvent XErrorEvent;
 public alias dwt.internal.c.Xlib.XExposeEvent XExposeEvent;
@@ -161,13 +168,16 @@
 
 
 // function with variadic argument list
-private void gtk_widget_style_get1( GtkWidget* widget, gchar* firstPropertyName, int* res ){
+private void gtk_widget_style_get1( GtkWidget* widget, char* 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 ){
+private void g_object_get1( void* obj, char* firstPropertyName, int* res ){
     g_object_get( obj, firstPropertyName, res, null );
 }
+private void g_object_set1( void* obj, char* firstPropertyName, int value ){
+    g_object_set( obj, firstPropertyName, value, null );
+}
 
 private void g_signal_emit_by_name0( void* instance, char* detailed_signal ){
     g_signal_emit_by_name( instance, detailed_signal );
@@ -910,11 +920,7 @@
     mixin ForwardGtkOsCFunc!(.g_object_get_qdata);
     mixin ForwardGtkOsCFunc!(.g_object_new);
     mixin ForwardGtkOsCFunc!(.g_object_ref);
-    mixin ForwardGtkOsCFunc!(.g_object_set);
-    mixin ForwardGtkOsCFunc!(.g_object_set);
-    mixin ForwardGtkOsCFunc!(.g_object_set);
-    mixin ForwardGtkOsCFunc!(.g_object_set);
-    mixin ForwardGtkOsCFunc!(.g_object_set);
+    mixin ForwardGtkOsCFunc!(.g_object_set1);
     mixin ForwardGtkOsCFunc!(.g_object_set_qdata);
     mixin ForwardGtkOsCFunc!(.g_object_unref);
     mixin ForwardGtkOsCFunc!(.g_quark_from_string);
@@ -1284,7 +1290,7 @@
     mixin ForwardGtkOsCFunc!(.gtk_im_context_focus_in);
     mixin ForwardGtkOsCFunc!(.gtk_im_context_focus_out);
     mixin ForwardGtkOsCFunc!(.gtk_im_context_get_preedit_string);
-//    mixin ForwardGtkOsCFunc!(.gtk_im_context_get_type);
+    mixin ForwardGtkOsCFunc!(.gtk_im_context_get_type);
     mixin ForwardGtkOsCFunc!(.gtk_im_context_reset);
     mixin ForwardGtkOsCFunc!(.gtk_im_context_set_client_window);
     mixin ForwardGtkOsCFunc!(.gtk_im_context_set_cursor_location);
@@ -1307,14 +1313,14 @@
     mixin ForwardGtkOsCFunc!(.gtk_label_set_line_wrap);
     mixin ForwardGtkOsCFunc!(.gtk_label_set_text);
     mixin ForwardGtkOsCFunc!(.gtk_label_set_text_with_mnemonic);
-//    mixin ForwardGtkOsCFunc!(.gtk_list_append_items);
-//    mixin ForwardGtkOsCFunc!(.gtk_list_clear_items);
-//    mixin ForwardGtkOsCFunc!(.gtk_list_insert_items);
-//    mixin ForwardGtkOsCFunc!(.gtk_list_item_new_with_label);
-//    mixin ForwardGtkOsCFunc!(.gtk_list_remove_items);
-//    mixin ForwardGtkOsCFunc!(.gtk_list_select_item);
-//    mixin ForwardGtkOsCFunc!(.gtk_list_unselect_all);
-//    mixin ForwardGtkOsCFunc!(.gtk_list_unselect_item);
+    mixin ForwardGtkOsCFunc!(.gtk_list_append_items);
+    mixin ForwardGtkOsCFunc!(.gtk_list_clear_items);
+    mixin ForwardGtkOsCFunc!(.gtk_list_insert_items);
+    mixin ForwardGtkOsCFunc!(.gtk_list_item_new_with_label);
+    mixin ForwardGtkOsCFunc!(.gtk_list_remove_items);
+    mixin ForwardGtkOsCFunc!(.gtk_list_select_item);
+    mixin ForwardGtkOsCFunc!(.gtk_list_unselect_all);
+    mixin ForwardGtkOsCFunc!(.gtk_list_unselect_item);
     mixin ForwardGtkOsCFunc!(.gtk_list_store_append);
     mixin ForwardGtkOsCFunc!(.gtk_list_store_clear);
     mixin ForwardGtkOsCFunc!(.gtk_list_store_insert);
@@ -1325,9 +1331,6 @@
     mixin ForwardGtkOsCFunc!(.gtk_list_store_set);
     mixin ForwardGtkOsCFunc!(.gtk_list_store_set);
     mixin ForwardGtkOsCFunc!(.gtk_list_store_set);
-//    mixin ForwardGtkOsCFunc!(.gtk_major_version);
-//    mixin ForwardGtkOsCFunc!(.gtk_minor_version);
-//    mixin ForwardGtkOsCFunc!(.gtk_micro_version);
     mixin ForwardGtkOsCFunc!(.gtk_main);
     mixin ForwardGtkOsCFunc!(.gtk_main_iteration);
     mixin ForwardGtkOsCFunc!(.gtk_main_do_event);
@@ -1526,7 +1529,6 @@
     mixin ForwardGtkOsCFunc!(.gtk_text_buffer_get_selection_bounds);
     mixin ForwardGtkOsCFunc!(.gtk_text_buffer_get_text);
     mixin ForwardGtkOsCFunc!(.gtk_text_buffer_insert);
-    mixin ForwardGtkOsCFunc!(.gtk_text_buffer_insert);
     mixin ForwardGtkOsCFunc!(.gtk_text_buffer_move_mark);
     mixin ForwardGtkOsCFunc!(.gtk_text_buffer_paste_clipboard);
     mixin ForwardGtkOsCFunc!(.gtk_text_buffer_place_cursor);