changeset 32:b7c28480e3e0

removed exclude for OS.d in dsss.conf
author Frank Benoit <benoit@tionex.de>
date Wed, 09 Jan 2008 07:07:50 +0100
parents 5c24c1a67fc2
children 27324bbbac70
files dsss.conf dwt/internal/gtk/OS.d dwt/internal/gtk/c/glibtypes.d dwt/internal/gtk/c/gtktypes.d
diffstat 4 files changed, 61 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/dsss.conf	Wed Jan 09 06:57:07 2008 +0100
+++ b/dsss.conf	Wed Jan 09 07:07:50 2008 +0100
@@ -1,4 +1,3 @@
 [dwt]
 type=library
-exclude=dwt/internal/gtk/OS.d
 
--- a/dwt/internal/gtk/OS.d	Wed Jan 09 06:57:07 2008 +0100
+++ b/dwt/internal/gtk/OS.d	Wed Jan 09 07:07:50 2008 +0100
@@ -247,7 +247,7 @@
 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, 0, 0 );
+    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
@@ -2060,15 +2060,6 @@
     //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 ) {
         return arg0.bg_pixmap_name[arg1];
@@ -2102,7 +2093,7 @@
 
     //gtk_style_get_font_desc(arg0) (arg0)->font_desc
     static PangoFontDescription* gtk_style_get_font_desc( GtkStyle* arg0 ) {
-        return arg0.font_desc;
+        return cast( PangoFontDescription* ) arg0.font_desc;
     }
     //gtk_style_get_base(arg0, arg1, arg2) *arg2 = (arg0)->base[arg1]
     static void gtk_style_get_base( GtkStyle* arg0, int arg1, GdkColor* arg2 ) {
--- a/dwt/internal/gtk/c/glibtypes.d	Wed Jan 09 06:57:07 2008 +0100
+++ b/dwt/internal/gtk/c/glibtypes.d	Wed Jan 09 07:07:50 2008 +0100
@@ -1947,7 +1947,12 @@
  * gpointerdata;
  * holds the element's data, which can be a pointer to any kind of data,
  */
-public struct GList{}
+public struct GList{
+    void * data;
+    GList * next;
+    GList * prev;
+}
+
 // void* data;
 // glib-Doubly-Linked-Lists.html
 // GList *next;
--- a/dwt/internal/gtk/c/gtktypes.d	Wed Jan 09 06:57:07 2008 +0100
+++ b/dwt/internal/gtk/c/gtktypes.d	Wed Jan 09 07:07:50 2008 +0100
@@ -2077,7 +2077,23 @@
  * This can later be composited together with other
  * GtkRcStyle structures to form a GtkStyle.
  */
-public struct GtkRcStyle{}
+public struct GtkRcStyle{
+    GObject parent_instance;
+    char * name;
+    char * [5] bg_pixmap_name;
+    void * font_desc;
+    int [5] color_flags;
+    GdkColor [5] fg;
+    GdkColor [5] bg;
+    GdkColor [5] text;
+    GdkColor [5] base;
+    int xthickness;
+    int ythickness;
+    GArray * rc_properties;
+    GSList * rc_style_lists;
+    GSList * icon_factories;
+    uint engine_specified;
+}
 // char *name;
 // gtk-Resource-Files.html
 // char *bgPixmapName[5];
@@ -2224,7 +2240,42 @@
 /**
  * Main Gtk struct.
  */
-public struct GtkStyle{}
+public struct GtkStyle{
+    GObject parent_instance;
+    GdkColor [5] fg;
+    GdkColor [5] bg;
+    GdkColor [5] light;
+    GdkColor [5] dark;
+    GdkColor [5] mid;
+    GdkColor [5] text;
+    GdkColor [5] base;
+    GdkColor [5] text_aa;
+    GdkColor black;
+    GdkColor white;
+    void * font_desc;
+    int xthickness;
+    int ythickness;
+    GdkGC * [5] fg_gc;
+    GdkGC * [5] bg_gc;
+    GdkGC * [5] light_gc;
+    GdkGC * [5] dark_gc;
+    GdkGC * [5] mid_gc;
+    GdkGC * [5] text_gc;
+    GdkGC * [5] base_gc;
+    GdkGC * [5] text_aa_gc;
+    GdkGC * black_gc;
+    GdkGC * white_gc;
+    GdkDrawable * [5] bg_pixmap;
+    int attach_count;
+    int depth;
+    GdkColormap * colormap;
+    GdkFont * private_font;
+    void * private_font_desc;
+    GtkRcStyle * rc_style;
+    GSList * styles;
+    GArray * property_cache;
+    GSList * icon_factories;
+}
 // GdkColor fg[5];
 // GtkStyle.html
 // GdkColor bg[5];