Changeset 46

Timestamp:

06/01/06 20:10:38 (2 years ago)

Author:

Gregor

Message:

bcd/gen/bcdgen.d: Support instantiation of template classes with more than one template parameter.

bcd/cairo, bcd/glib2, bcd/pango, bcd/gdk, bcd/gtk2: Regenerated with constants.

Files:

• trunk/bcd/cairo/cairo.d (modified) (1 diff)
• trunk/bcd/gdk/gdk.d (modified) (1 diff)
• trunk/bcd/gen/bcdgen.d (modified) (4 diffs)
• trunk/bcd/glib2/glib_object.d (modified) (1 diff)
• trunk/bcd/gtk2/gtk.d (modified) (3 diffs)
• trunk/bcd/pango/pango.d (modified) (1 diff)
• trunk/scripts/gdk.sh (modified) (1 diff)

trunk/bcd/cairo/cairo.d

@@ -1 +1 @@
-/* THIS FILE GENERATED BY bcd.gen */
-module bcd.cairo.cairo;
+const int CAIRO_VERSION_MAJOR = 1;
+const int CAIRO_VERSION_MINOR = 0;
+const int CAIRO_VERSION_MICRO = 0;
+const int CAIRO_HAS_XLIB_SURFACE = 1;
+const int CAIRO_HAS_FT_FONT = 1;
+const int CAIRO_HAS_PNG_FUNCTIONS = 1;
-enum _cairo_filter {
-CAIRO_FILTER_FAST=0,

trunk/bcd/gdk/gdk.d

@@ -4 +4 @@
-import bcd.pango.pango;
-import bcd.glib2.glib;
+const int GDK_PIXBUF_FEATURES_H = 1;
+const int GDK_MAX_TIMECOORD_AXES = 128;
-alias _GdkWindowObjectClass GdkWindowObjectClass;
-alias _GdkDrawableClass GdkDrawableClass;

trunk/bcd/gen/bcdgen.d

@@ -79 +79 @@
-        writefln("Options:");
-        writefln("  -I<include prefix>");
-        writefln("  -N<symbol to ignore>");
-        writefln("  -C");
-        writefln("    Read/write C instead of C++");
-        writefln("  -R<include directory>=<BCD/D namespace>");
-        writefln("    Depend upon other BCD namespaces.");
-        writefln("  -A");
-        writefln("    Include all symbols provided by headers in the same");
@@ -89 +86 @@
-        writefln("    they are actually provded by the included file.");
-        writefln("  -F<forced import>");
-T<template class
-Make the given template class accessable from D
+R<include directory>=<BCD/D namespace
+Depend upon other BCD namespaces
-        writefln("  -E");
-        writefln("    Generate const int's for unnamed enum values");
+        writefln("  -T<template class>[=<count>]");
+        writefln("    Make the given template class accessable from D.  If the");
+        writefln("    class has more than one template parameter, also provide");
+        writefln("    the count.");
+        writefln("  -N<symbol to ignore>");
-        return 1;
-    }
@@ -113 +115 @@
-        if (args[i][0..2] == "-I") {
-            incPrefix = args[i][2..args[i].length];
+            
-        } else if (args[i][0..2] == "-N") {
-            ignoreSyms ~= args[i][2..args[i].length];
+            
-        } else if (args[i] == "-C") {
-            outputC = true;
+            
-        } else if (args[i][0..2] == "-R") {
-            char[] req = args[i][2..args[i].length];
@@ -125 +130 @@
-            }
-            reqDependencies[req[0..eqloc]] = req[eqloc + 1 .. req.length];
+            
-        } else if (args[i] == "-A") {
-            outputAll = true;
+            
-        } else if (args[i][0..2] == "-F") {
-            forcedImport ~= "import " ~ args[i][2..args[i].length] ~ ";\n";
+            
-        } else if (args[i][0..2] == "-T") {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            onTemplate++;
+            
-        } else if (args[i] == "-E") {
-            outputEnumConst = true;
+            
-        } else {
-            writefln("Argument %s not recognized.", args[i]);

trunk/bcd/glib2/glib_object.d

@@ -3 +3 @@
-struct _GStaticMutex {}
-struct _GSystemThread {}
+const double G_E = 2.7182818284590452353602874713526624977572470937000;
+const double G_LN2 = 0.69314718055994530941723212145817656807550013436026;
+const double G_LN10 = 2.3025850929940456840179914546843642076011014886288;
+const double G_PI = 3.1415926535897932384626433832795028841971693993751;
+const double G_PI_2 = 1.5707963267948966192313216916397514420985846996876;
+const double G_PI_4 = 0.78539816339744830961566084581987572104929234984378;
+const double G_SQRT2 = 1.4142135623730950488016887242096980785696718753769;
+const int G_LITTLE_ENDIAN = 1234;
+const int G_BIG_ENDIAN = 4321;
+const int G_PDP_ENDIAN = 3412;
+const int G_ALLOC_ONLY = 1;
+const int G_ALLOC_AND_FREE = 2;
+const int G_DATALIST_FLAGS_MASK = 0x3;
+const int G_PRIORITY_HIGH = -100;
+const int G_PRIORITY_DEFAULT = 0;
+const int G_PRIORITY_HIGH_IDLE = 100;
+const int G_PRIORITY_DEFAULT_IDLE = 200;
+const int G_PRIORITY_LOW = 300;
+const int G_USEC_PER_SEC = 1000000;
-alias char gchar;
-alias char * gchararray;

trunk/bcd/gtk2/gtk.d

@@ -6 +6 @@
-import bcd.gdk.gdk;
-import bcd.glib2.glib;
+const int GTK_BUTTONBOX_DEFAULT = -1;
+const int GTK_MAX_COMPOSE_LEN = 7;
+const int GTK_INPUT_ERROR = -1;
-alias _GtkVSeparatorClass GtkVSeparatorClass;
-alias _GtkSeparatorClass GtkSeparatorClass;
@@ -803 +806 @@
-GTK_BUTTON_DRAGS=2,
-GTK_BUTTON_EXPANDS=4,
+}
+enum __205 {
+GTK_CLIST_IN_DRAG=1,
+GTK_CLIST_ROW_HEIGHT_SET=2,
+GTK_CLIST_SHOW_TITLES=4,
+GTK_CLIST_ADD_MODE=16,
+GTK_CLIST_AUTO_SORT=32,
+GTK_CLIST_AUTO_RESIZE_BLOCKED=64,
+GTK_CLIST_REORDERABLE=128,
+GTK_CLIST_USE_DRAG_ICONS=256,
+GTK_CLIST_DRAW_DRAG_LINE=512,
+GTK_CLIST_DRAW_DRAG_RECT=1024,
-}
-alias _GtkVScrollbarClass GtkVScrollbarClass;
@@ -894 +909 @@
-alias void function(void *, _BCD_func__10268, void *, _BCD_func__11666) _BCD_func__15269;
-alias int function(void *) _BCD_func__15270;
+enum __203 {
+GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID=-1,
+GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID=-2,
+}
-enum GtkTreeModelFlags {
-GTK_TREE_MODEL_ITERS_PERSIST=1,

trunk/bcd/pango/pango.d

@@ -2 +2 @@
-module bcd.pango.pango;
-import bcd.glib2.glib;
+const int PANGO_SCALE = 1024;
-enum PangoRenderPart {
-PANGO_RENDER_PART_FOREGROUND=0,

trunk/scripts/gdk.sh

@@ -2 +2 @@
-export CFLAGS="$CFLAGS `pkg-config --cflags gdk-2.0`"
-
-2
+
-
-echo gdk