--- a/dwt/internal/gtk/OS.d	Mon Jan 14 02:06:07 2008 +0100
+++ b/dwt/internal/gtk/OS.d	Tue Jan 15 04:10:36 2008 +0100
@@ -163,6 +163,11 @@
 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.gtk.GtkComboBox GtkComboBox;
+public alias dwt.internal.c.gtk.GtkListItem GtkListItem;
+public alias dwt.internal.c.gtk.GtkList GtkList;
+public alias dwt.internal.c.gtk.GtkCellLayout GtkCellLayout;
+public alias dwt.internal.c.gtk.GtkCombo GtkCombo;
 
 public alias dwt.internal.c.Xlib.XErrorEvent XErrorEvent;
 public alias dwt.internal.c.Xlib.XExposeEvent XExposeEvent;
@@ -213,6 +218,9 @@
 private void gtk_tree_model_get1(GtkTreeModel * store , GtkTreeIter * iter, int column, void** value ){
     gtk_tree_model_get( store, iter, column, value, -1 );
 }
+private void gtk_cell_layout_set_attributes1( GtkCellLayout *cell_layout, GtkCellRenderer *cell, void* key, void* value ){
+    gtk_cell_layout_set_attributes( cell_layout, cell, key, value, null );
+}
 
 // for linux always true, the other possibility would be GDK_WINDOWING_WIN32
 private bool GDK_WINDOWING_X11(){
@@ -845,7 +853,6 @@
     mixin ForwardGtkOsCFunc!(.gdk_window_remove_filter);
 
 /** X render natives and constants */
- //   mixin ForwardGtkOsCFunc!(XRenderPictureAttributes_sizeof);
 
     mixin ForwardGtkOsCFunc!(.XRenderQueryExtension);
     mixin ForwardGtkOsCFunc!(.XRenderQueryVersion);
@@ -856,48 +863,7 @@
     mixin ForwardGtkOsCFunc!(.XRenderComposite);
     mixin ForwardGtkOsCFunc!(.XRenderFindStandardFormat);
     mixin ForwardGtkOsCFunc!(.XRenderFindVisualFormat);
-    //mixin ForwardGtkOsCFunc!(Call );
-    //mixin ForwardGtkOsCFunc!(.GDK_DISPLAY);
-    //mixin ForwardGtkOsCFunc!(.GDK_ROOT_PARENT);
-//     mixin ForwardGtkOsCFunc!(.GDK_TYPE_COLOR);
-//     mixin ForwardGtkOsCFunc!(.GDK_TYPE_PIXBUF);
-//     mixin ForwardGtkOsCFunc!(.GTK_IS_BUTTON);
-     //mixin ForwardGtkOsCFunc!(.GTK_IS_WINDOW);
-//     mixin ForwardGtkOsCFunc!(.GTK_IS_CELL_RENDERER_PIXBUF);
-//     mixin ForwardGtkOsCFunc!(.GTK_IS_CELL_RENDERER_TEXT);
-//     mixin ForwardGtkOsCFunc!(.GTK_IS_CELL_RENDERER_TOGGLE);
-     //mixin ForwardGtkOsCFunc!(.GTK_IS_CONTAINER);
-//     mixin ForwardGtkOsCFunc!(.GTK_IS_IMAGE_MENU_ITEM);
-     //mixin ForwardGtkOsCFunc!(.GTK_IS_PLUG);
-//     mixin ForwardGtkOsCFunc!(.GTK_STOCK_CANCEL);
-//     mixin ForwardGtkOsCFunc!(.GTK_STOCK_OK);
-     //mixin ForwardGtkOsCFunc!(.GTK_TYPE_CELL_RENDERER_TEXT);
-     //mixin ForwardGtkOsCFunc!(.GTK_TYPE_CELL_RENDERER_PIXBUF);
-     //mixin ForwardGtkOsCFunc!(.GTK_TYPE_CELL_RENDERER_TOGGLE);
-     //mixin ForwardGtkOsCFunc!(.GTK_TYPE_FIXED);
 
-     //mixin ForwardGtkOsCFunc!(.GTK_TYPE_MENU);
-     //mixin ForwardGtkOsCFunc!(.GTK_TYPE_WIDGET);
-     /+mixin ForwardGtkOsCFunc!(.GTK_WIDGET_FLAGS);
-     mixin ForwardGtkOsCFunc!(.GTK_WIDGET_STATE);
-     mixin ForwardGtkOsCFunc!(.GTK_WIDGET_HAS_DEFAULT);
-     mixin ForwardGtkOsCFunc!(.GTK_WIDGET_HAS_FOCUS);
-     mixin ForwardGtkOsCFunc!(.GTK_WIDGET_IS_SENSITIVE);
-     mixin ForwardGtkOsCFunc!(.GTK_WIDGET_MAPPED);
-     mixin ForwardGtkOsCFunc!(.GTK_WIDGET_SENSITIVE);
-     mixin ForwardGtkOsCFunc!(.GTK_WIDGET_SET_FLAGS);
-     mixin ForwardGtkOsCFunc!(.GTK_WIDGET_UNSET_FLAGS);
-     mixin ForwardGtkOsCFunc!(.GTK_WIDGET_VISIBLE);
-     mixin ForwardGtkOsCFunc!(.G_OBJECT_CLASS );
-     mixin ForwardGtkOsCFunc!(.G_OBJECT_GET_CLASS );
-     mixin ForwardGtkOsCFunc!(.G_OBJECT_TYPE_NAME );
-     mixin ForwardGtkOsCFunc!(.G_TYPE_BOOLEAN);
-     mixin ForwardGtkOsCFunc!(.G_TYPE_INT);
-     mixin ForwardGtkOsCFunc!(.G_OBJECT_TYPE );
-     mixin ForwardGtkOsCFunc!(.G_TYPE_STRING);
-    mixin ForwardGtkOsCFunc!(.PANGO_PIXELS);
-    //mixin ForwardGtkOsCFunc!(.PANGO_TYPE_FONT_DESCRIPTION);
-+/
     mixin ForwardGtkOsCFunc!(.g_cclosure_new);
     mixin ForwardGtkOsCFunc!(.g_closure_ref);
     mixin ForwardGtkOsCFunc!(.g_closure_unref);
@@ -918,17 +884,12 @@
     mixin ForwardGtkOsCFunc!(.g_free);
     mixin ForwardGtkOsCFunc!(.g_idle_add);
     mixin ForwardGtkOsCFunc!(.g_list_append);
-    //mixin ForwardGtkOsCFunc!(.g_list_data); // macro impl
     mixin ForwardGtkOsCFunc!(.g_list_free);
     mixin ForwardGtkOsCFunc!(.g_list_free_1);
     mixin ForwardGtkOsCFunc!(.g_list_length);
-//   mixin ForwardGtkOsCFunc!(.g_list_set_next);
-    //mixin ForwardGtkOsCFunc!(.g_list_next);
     mixin ForwardGtkOsCFunc!(.g_list_nth);
     mixin ForwardGtkOsCFunc!(.g_list_nth_data);
     mixin ForwardGtkOsCFunc!(.g_list_prepend);
-//    mixin ForwardGtkOsCFunc!(.g_list_set_previous);
-    //mixin ForwardGtkOsCFunc!(.g_list_previous);
     mixin ForwardGtkOsCFunc!(.g_list_remove_link);
     mixin ForwardGtkOsCFunc!(.g_list_reverse);
     mixin ForwardGtkOsCFunc!(.g_locale_from_utf8);
@@ -946,10 +907,8 @@
     mixin ForwardGtkOsCFunc!(.g_object_unref);
     mixin ForwardGtkOsCFunc!(.g_quark_from_string);
     mixin ForwardGtkOsCFunc!(.g_set_prgname);
-    //mixin ForwardGtkOsCFunc!(.g_signal_connect);
     mixin ForwardGtkOsCFunc!(.g_signal_connect_closure);
     mixin ForwardGtkOsCFunc!(.g_signal_connect_closure_by_id);
-//    mixin ForwardGtkOsCFunc!(.g_signal_connect_after);
     mixin ForwardGtkOsCFunc!(.g_signal_emit_by_name0);
     mixin ForwardGtkOsCFunc!(.g_signal_emit_by_name1);
     mixin ForwardGtkOsCFunc!(.g_signal_emit_by_name2);
@@ -961,9 +920,7 @@
     mixin ForwardGtkOsCFunc!(.g_signal_lookup );
     mixin ForwardGtkOsCFunc!(.g_signal_stop_emission_by_name);
     mixin ForwardGtkOsCFunc!(.g_source_remove );
- //   mixin ForwardGtkOsCFunc!(.g_slist_data );
     mixin ForwardGtkOsCFunc!(.g_slist_free );
- //   mixin ForwardGtkOsCFunc!(.g_slist_next );
     mixin ForwardGtkOsCFunc!(.g_slist_length );
     mixin ForwardGtkOsCFunc!(.g_strfreev);
     mixin ForwardGtkOsCFunc!(.g_strtod);
@@ -1173,7 +1130,7 @@
     mixin ForwardGtkOsCFunc!(.gtk_calendar_display_options);
     mixin ForwardGtkOsCFunc!(.gtk_calendar_get_date);
     mixin ForwardGtkOsCFunc!(.gtk_cell_layout_clear);
-    mixin ForwardGtkOsCFunc!(.gtk_cell_layout_set_attributes);
+    mixin ForwardGtkOsCFunc!(.gtk_cell_layout_set_attributes1);
     mixin ForwardGtkOsCFunc!(.gtk_cell_layout_pack_start);
     mixin ForwardGtkOsCFunc!(.gtk_cell_renderer_get_size);
     mixin ForwardGtkOsCFunc!(.gtk_cell_renderer_pixbuf_new);
@@ -1192,10 +1149,10 @@
     mixin ForwardGtkOsCFunc!(.gtk_color_selection_get_current_color);
     mixin ForwardGtkOsCFunc!(.gtk_color_selection_set_current_color);
     mixin ForwardGtkOsCFunc!(.gtk_color_selection_set_has_palette);
- //   mixin ForwardGtkOsCFunc!(.gtk_combo_disable_activate);
- //   mixin ForwardGtkOsCFunc!(.gtk_combo_new);
- //   mixin ForwardGtkOsCFunc!(.gtk_combo_set_case_sensitive);
- //   mixin ForwardGtkOsCFunc!(.gtk_combo_set_popdown_strings);
+    mixin ForwardGtkOsCFunc!(.gtk_combo_disable_activate);
+    mixin ForwardGtkOsCFunc!(.gtk_combo_new);
+    mixin ForwardGtkOsCFunc!(.gtk_combo_set_case_sensitive);
+    mixin ForwardGtkOsCFunc!(.gtk_combo_set_popdown_strings);
     mixin ForwardGtkOsCFunc!(.gtk_combo_box_entry_new_text);
     mixin ForwardGtkOsCFunc!(.gtk_combo_box_new_text);
     mixin ForwardGtkOsCFunc!(.gtk_combo_box_insert_text);
@@ -1928,17 +1885,6 @@
     //     { return arg0.window; }
 
 /+
-    //g_list_data(arg0) (arg0)->data
-    static void* g_list_data( GList* arg0 ) {
-        return arg0.data;
-    }
-    //g_list_next(list) ((list) ? (((GList *)(list))->next) : NULL)
-    static void* g_list_next( GList* list ) {
-        return list ? list.next : null;
-    }
-    //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]
     static char* gtk_rc_style_get_bg_pixmap_name( GtkRcStyle* arg0, int arg1 ) {