[Gd-chatter] r11485 - branches/opendylan-melange/gtk-c-ffi
hannes at gwydiondylan.org
hannes at gwydiondylan.org
Thu Nov 8 00:01:31 CET 2007
Author: hannes
Date: Thu Nov 8 00:01:31 2007
New Revision: 11485
Modified:
branches/opendylan-melange/gtk-c-ffi/gtk-2-12-linux.dylan
Log:
Job: fd
update that gtk-2-12 compiles with opendylan. These are the manual
changes needed after generation of melange.
Modified: branches/opendylan-melange/gtk-c-ffi/gtk-2-12-linux.dylan
==============================================================================
--- branches/opendylan-melange/gtk-c-ffi/gtk-2-12-linux.dylan (original)
+++ branches/opendylan-melange/gtk-c-ffi/gtk-2-12-linux.dylan Thu Nov 8 00:01:31 2007
@@ -1,5 +1,12 @@
module: gtk-internal
+define inline-only function log-entry(c-function-name, #rest args) => ();
+ format-out("entering %s %=", c-function-name, args);
+end;
+define inline-only function log-exit(c-function-name, #rest results) => ();
+ format-out(" => %=\n", results);
+end;
+
define constant <gsize> = <C-unsigned-int>;
define constant <GType> = <gsize>;
@@ -34,7 +41,7 @@
define constant <gchar> = <C-signed-char>;
-define C-pointer-type <gchar*> => <gchar>;
+define constant <gchar*> = <C-string>;
define constant <GParamFlags> = <C-int>;
define constant $G-PARAM-READABLE = 1;
define constant $G-PARAM-WRITABLE = 2;
@@ -202,6 +209,9 @@
define C-subtype <_GdkGC> (<_GObject>) end;
define constant <GdkGC> = <_GdkGC>;
+define C-subtype <_GdkGCX11> (<_GdkGC>) end;
+define constant <GdkGCX11> = <_GdkGCX11>;
+
define C-pointer-type <GdkGC*> => <GdkGC>;
define constant <GdkGC<@5>> = <GdkGC*>;
define C-subtype <_GdkDrawable> (<_GObject>) end;
@@ -644,7 +654,7 @@
define constant <gushort> = <C-unsigned-short>;
-define C-pointer-type <char*> => <C-signed-char>;
+define constant <char*> = <C-string>;
define constant <char<@20>> = <char*>;
define C-pointer-type <short*> => <C-signed-short>;
define constant <short<@10>> = <short*>;
@@ -4456,10 +4466,6 @@
define constant $G-MAXUINT16 = 65535;
-define constant $G-MAXUINT32 = #ex00000000FFFFFFFF;
-
-define constant $G-MAXINT64 = #ex7FFFFFFFFFFFFFFF;
-
define constant $G-LITTLE-ENDIAN = 1234;
define constant $G-BIG-ENDIAN = 4321;
@@ -4500,18 +4506,6 @@
define constant $G-MAXUSHORT = 65535;
-define constant $G-MININT = #exFFFFFFFF80000000;
-
-define constant $G-MAXINT = #ex000000007FFFFFFF;
-
-define constant $G-MAXUINT = #ex00000000FFFFFFFF;
-
-define constant $G-MINLONG = #exFFFFFFFF80000000;
-
-define constant $G-MAXLONG = #ex000000007FFFFFFF;
-
-define constant $G-MAXULONG = #ex00000000FFFFFFFF;
-
define constant $G-GINT16-MODIFIER = "h";
define constant $G-GINT16-FORMAT = "hi";
@@ -4544,12 +4538,6 @@
define constant $G-GSIZE-FORMAT = "u";
-define constant $G-MAXSIZE = #ex00000000FFFFFFFF;
-
-define constant $G-MINSSIZE = #exFFFFFFFF80000000;
-
-define constant $G-MAXSSIZE = #ex000000007FFFFFFF;
-
define constant $GLIB-MAJOR-VERSION = 2;
define constant $GLIB-MINOR-VERSION = 14;
@@ -4600,18 +4588,6 @@
define constant $USHRT-MAX = 65535;
-define constant $INT-MIN = #exFFFFFFFF80000000;
-
-define constant $INT-MAX = #ex000000007FFFFFFF;
-
-define constant $UINT-MAX = #ex00000000FFFFFFFF;
-
-define constant $LONG-MAX = #ex000000007FFFFFFF;
-
-define constant $LONG-MIN = #exFFFFFFFF80000000;
-
-define constant $ULONG-MAX = #ex00000000FFFFFFFF;
-
define constant $_BITS-POSIX2-LIM-H = 1;
define constant $_POSIX2-BC-BASE-MAX = 99;
@@ -4720,8 +4696,6 @@
define constant $_POSIX-CLOCKRES-MIN = 20000000;
-define constant $SSIZE-MAX = #ex000000007FFFFFFF;
-
define constant $_POSIX-THREAD-KEYS-MAX = 128;
define constant $PTHREAD-KEYS-MAX = 1024;
@@ -4736,8 +4710,6 @@
define constant $PTHREAD-STACK-MIN = 16384;
-define constant $DELAYTIMER-MAX = #ex000000007FFFFFFF;
-
define constant $TTY-NAME-MAX = 32;
define constant $LOGIN-NAME-MAX = 256;
@@ -4746,8 +4718,6 @@
define constant $MQ-PRIO-MAX = 32768;
-define constant $SEM-VALUE-MAX = #ex000000007FFFFFFF;
-
define constant $NGROUPS-MAX = 65536;
define constant $ARG-MAX = 131072;
@@ -4822,8 +4792,6 @@
define constant <__ptr-t> = <C-void*>;
-define constant <__long-double-t> = <C-extended>;
-
define constant $G-GNUC-FUNCTION = "";
define constant $G-GNUC-PRETTY-FUNCTION = "";
@@ -6545,8 +6513,6 @@
c-name: "g_once_init_leave";
end;
-define constant $G-MUTEX-DEBUG-MAGIC = #ex00000000F8E18AD7;
-
define C-function g-atomic-int-exchange-and-add
input parameter arg1 :: <gint*>;
input parameter arg2 :: <gint>;
@@ -16845,13 +16811,13 @@
end;
define C-struct <_IO-marker>
- slot IO_marker-_next :: <_IO-marker>;
- slot IO_marker-_sbuf :: <_IO-FILE>;
+ slot IO_marker-_next :: <C-void*>; //<_IO-marker>;
+ slot IO_marker-_sbuf :: <C-void*>; //<_IO-FILE>;
slot IO_marker-_pos :: <C-signed-int>;
end;
define constant <char<@1>> = <char*>;
-define constant <_IO-lock-t> = <void>;
+define constant <_IO-lock-t> = <void*>;
define C-pointer-type <_IO-lock-t*> => <_IO-lock-t>;
define constant <char<@40>> = <char*>;
@@ -16869,7 +16835,7 @@
slot IO_FILE-_IO-backup-base :: <char*>;
slot IO_FILE-_IO-save-end :: <char*>;
slot IO_FILE-_markers :: <_IO-marker>;
- slot IO_FILE-_chain :: <_IO-FILE>;
+ slot IO_FILE-_chain :: <C-void*>; //<_IO-FILE>;
slot IO_FILE-_fileno :: <C-signed-int>;
slot IO_FILE-_flags2 :: <C-signed-int>;
slot IO_FILE-_old-offset :: <C-signed-long>;
@@ -18607,7 +18573,7 @@
slot _gconv_trans_data-__trans-context-fct :: <anonymous-2301>;
slot _gconv_trans_data-__trans-end-fct :: <anonymous-2304>;
slot _gconv_trans_data-__data :: <C-void*>;
- slot _gconv_trans_data-__next :: <__gconv-trans-data>;
+ slot _gconv_trans_data-__next :: <C-void*>; //<__gconv-trans-data>;
end;
define C-struct <__gconv-step-data>
@@ -18696,12 +18662,6 @@
define constant $_IOS-BIN = 128;
-define constant $_IO-MAGIC = #ex00000000FBAD0000;
-
-define constant $_OLD-STDIO-MAGIC = #ex00000000FABC0000;
-
-define constant $_IO-MAGIC-MASK = #ex00000000FFFF0000;
-
define constant $_IO-USER-BUF = 1;
define constant $_IO-UNBUFFERED = 2;
@@ -18870,10 +18830,6 @@
define constant $_BITS-WCHAR-H = 1;
-define constant $__WCHAR-MIN = #exFFFFFFFF80000000;
-
-define constant $__WCHAR-MAX = #ex000000007FFFFFFF;
-
define C-struct <_PangoTabArray>
end;
@@ -21857,7 +21813,7 @@
define constant $GDK-FILTER-TRANSLATE = 1;
define constant $GDK-FILTER-REMOVE = 2;
-define constant <GdkXEvent> = <void>;
+define constant <GdkXEvent> = <C-int>;
define C-pointer-type <GdkXEvent*> => <GdkXEvent>;
define constant <anonymous-2672> = <C-function-pointer>;
@@ -22175,9 +22131,9 @@
define C-function gdk-window-get-pointer
input parameter arg1 :: <GdkWindow>;
- output parameter arg2 :: <gint>;
- output parameter arg3 :: <gint>;
- output parameter arg4 :: <GdkModifierType>;
+ output parameter arg2 :: <gint*>;
+ output parameter arg3 :: <gint*>;
+ output parameter arg4 :: <GdkModifierType*>;
result res :: <GdkWindow>;
c-name: "gdk_window_get_pointer";
end;
@@ -48310,7 +48266,7 @@
c-name: "gtk_file_chooser_button_set_focus_on_click";
end;
-define C-subtype <_GtkFixed> (<_GtkContainer>, <_AtkImplementorIface>) end;
+define open C-subtype <_GtkFixed> (<_GtkContainer>, <_AtkImplementorIface>) end;
define constant <GtkFixed> = <_GtkFixed>;
define C-struct <_GtkFixedClass>
@@ -54311,4 +54267,3 @@
result res :: <GtkAboutDialogActivateLinkFunc>;
c-name: "gtk_about_dialog_set_url_hook";
end;
-
More information about the chatter
mailing list