Commit f832e348 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Switch style of stamp file usage.

Sat Mar  2 13:26:58 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/Makefile.am: Switch style of stamp file usage.

        * gtk/Makefile.am gtk/typeutils.[ch]: Switch all the exported
        enumeration/fags TYPE variables over to macros for get_type() functions,
        for lazy definition and to get rid of expensive relocations.

        * gtk/gtkiconfactory.[ch] gtk/gtkselection.[ch] gtk/gtkstyle.[ch]
        gtk/gtktextiter.[ch] gtk/gtktexttag.[ch] gtk/gtktreemodel.[ch]
        gtk/gtktypeutils.[ch] gtk/gtkwidget.[ch]: Switch boxed type
        definitions over manually coded get_type() functions.

        * gtk/gtk.def: Updates for above

        * gtk/{genmarshal.pl,makeenums.awk,makeenums.h,maketypes.awk}:
        Remove from CVS, no longer used.

        * configure.in: Remove checks for awk.
parent 36e686e6
Sat Mar 2 13:26:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am: Switch style of stamp file usage.
* gtk/Makefile.am gtk/typeutils.[ch]: Switch all the exported
enumeration/fags TYPE variables over to macros for get_type() functions,
for lazy definition and to get rid of expensive relocations.
* gtk/gtkiconfactory.[ch] gtk/gtkselection.[ch] gtk/gtkstyle.[ch]
gtk/gtktextiter.[ch] gtk/gtktexttag.[ch] gtk/gtktreemodel.[ch]
gtk/gtktypeutils.[ch] gtk/gtkwidget.[ch]: Switch boxed type
definitions over manually coded get_type() functions.
* gtk/gtk.def: Updates for above
* gtk/{genmarshal.pl,makeenums.awk,makeenums.h,maketypes.awk}:
Remove from CVS, no longer used.
* configure.in: Remove checks for awk.
Sat Mar 2 04:44:10 2002 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.c (gtk_accel_group_connect_by_path): fix typo.
......
Sat Mar 2 13:26:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am: Switch style of stamp file usage.
* gtk/Makefile.am gtk/typeutils.[ch]: Switch all the exported
enumeration/fags TYPE variables over to macros for get_type() functions,
for lazy definition and to get rid of expensive relocations.
* gtk/gtkiconfactory.[ch] gtk/gtkselection.[ch] gtk/gtkstyle.[ch]
gtk/gtktextiter.[ch] gtk/gtktexttag.[ch] gtk/gtktreemodel.[ch]
gtk/gtktypeutils.[ch] gtk/gtkwidget.[ch]: Switch boxed type
definitions over manually coded get_type() functions.
* gtk/gtk.def: Updates for above
* gtk/{genmarshal.pl,makeenums.awk,makeenums.h,maketypes.awk}:
Remove from CVS, no longer used.
* configure.in: Remove checks for awk.
Sat Mar 2 04:44:10 2002 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.c (gtk_accel_group_connect_by_path): fix typo.
......
Sat Mar 2 13:26:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am: Switch style of stamp file usage.
* gtk/Makefile.am gtk/typeutils.[ch]: Switch all the exported
enumeration/fags TYPE variables over to macros for get_type() functions,
for lazy definition and to get rid of expensive relocations.
* gtk/gtkiconfactory.[ch] gtk/gtkselection.[ch] gtk/gtkstyle.[ch]
gtk/gtktextiter.[ch] gtk/gtktexttag.[ch] gtk/gtktreemodel.[ch]
gtk/gtktypeutils.[ch] gtk/gtkwidget.[ch]: Switch boxed type
definitions over manually coded get_type() functions.
* gtk/gtk.def: Updates for above
* gtk/{genmarshal.pl,makeenums.awk,makeenums.h,maketypes.awk}:
Remove from CVS, no longer used.
* configure.in: Remove checks for awk.
Sat Mar 2 04:44:10 2002 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.c (gtk_accel_group_connect_by_path): fix typo.
......
Sat Mar 2 13:26:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am: Switch style of stamp file usage.
* gtk/Makefile.am gtk/typeutils.[ch]: Switch all the exported
enumeration/fags TYPE variables over to macros for get_type() functions,
for lazy definition and to get rid of expensive relocations.
* gtk/gtkiconfactory.[ch] gtk/gtkselection.[ch] gtk/gtkstyle.[ch]
gtk/gtktextiter.[ch] gtk/gtktexttag.[ch] gtk/gtktreemodel.[ch]
gtk/gtktypeutils.[ch] gtk/gtkwidget.[ch]: Switch boxed type
definitions over manually coded get_type() functions.
* gtk/gtk.def: Updates for above
* gtk/{genmarshal.pl,makeenums.awk,makeenums.h,maketypes.awk}:
Remove from CVS, no longer used.
* configure.in: Remove checks for awk.
Sat Mar 2 04:44:10 2002 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.c (gtk_accel_group_connect_by_path): fix typo.
......
Sat Mar 2 13:26:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am: Switch style of stamp file usage.
* gtk/Makefile.am gtk/typeutils.[ch]: Switch all the exported
enumeration/fags TYPE variables over to macros for get_type() functions,
for lazy definition and to get rid of expensive relocations.
* gtk/gtkiconfactory.[ch] gtk/gtkselection.[ch] gtk/gtkstyle.[ch]
gtk/gtktextiter.[ch] gtk/gtktexttag.[ch] gtk/gtktreemodel.[ch]
gtk/gtktypeutils.[ch] gtk/gtkwidget.[ch]: Switch boxed type
definitions over manually coded get_type() functions.
* gtk/gtk.def: Updates for above
* gtk/{genmarshal.pl,makeenums.awk,makeenums.h,maketypes.awk}:
Remove from CVS, no longer used.
* configure.in: Remove checks for awk.
Sat Mar 2 04:44:10 2002 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.c (gtk_accel_group_connect_by_path): fix typo.
......
Sat Mar 2 13:26:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am: Switch style of stamp file usage.
* gtk/Makefile.am gtk/typeutils.[ch]: Switch all the exported
enumeration/fags TYPE variables over to macros for get_type() functions,
for lazy definition and to get rid of expensive relocations.
* gtk/gtkiconfactory.[ch] gtk/gtkselection.[ch] gtk/gtkstyle.[ch]
gtk/gtktextiter.[ch] gtk/gtktexttag.[ch] gtk/gtktreemodel.[ch]
gtk/gtktypeutils.[ch] gtk/gtkwidget.[ch]: Switch boxed type
definitions over manually coded get_type() functions.
* gtk/gtk.def: Updates for above
* gtk/{genmarshal.pl,makeenums.awk,makeenums.h,maketypes.awk}:
Remove from CVS, no longer used.
* configure.in: Remove checks for awk.
Sat Mar 2 04:44:10 2002 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.c (gtk_accel_group_connect_by_path): fix typo.
......
Sat Mar 2 13:26:58 2002 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am: Switch style of stamp file usage.
* gtk/Makefile.am gtk/typeutils.[ch]: Switch all the exported
enumeration/fags TYPE variables over to macros for get_type() functions,
for lazy definition and to get rid of expensive relocations.
* gtk/gtkiconfactory.[ch] gtk/gtkselection.[ch] gtk/gtkstyle.[ch]
gtk/gtktextiter.[ch] gtk/gtktexttag.[ch] gtk/gtktreemodel.[ch]
gtk/gtktypeutils.[ch] gtk/gtkwidget.[ch]: Switch boxed type
definitions over manually coded get_type() functions.
* gtk/gtk.def: Updates for above
* gtk/{genmarshal.pl,makeenums.awk,makeenums.h,maketypes.awk}:
Remove from CVS, no longer used.
* configure.in: Remove checks for awk.
Sat Mar 2 04:44:10 2002 Tim Janik <timj@gtk.org>
* gtk/gtkaccelgroup.c (gtk_accel_group_connect_by_path): fix typo.
......
......@@ -14,16 +14,14 @@ gtkmarshal.h
gtkmarshal.c
gtkmarshalers.h
gtkmarshalers.c
gtktypebuiltins.c
gtktypebuiltins.h
gtktypebuiltins_ids.c
gtktypebuiltins_vars.c
gtktypebuiltins_evals.c
gtktypebuiltinss.c
gtk.defs
gtk-win32.rc
testdnd
stamp-gtktypebuiltins.h
stamp-gtkmarshal.h
stamp-gtkmarshalers.h
stamp-gtk.defs
gtk-query-immodules-2.0
.saved
......@@ -385,6 +385,7 @@ gtk_c_sources = @STRIP_BEGIN@ \
gtktreestore.c \
gtktreeview.c \
gtktreeviewcolumn.c \
gtktypebuiltins.c \
gtktypeutils.c \
gtkvbbox.c \
gtkvbox.c \
......@@ -423,9 +424,7 @@ gtk_built_sources = @STRIP_BEGIN@ \
stamp-gtk.defs \
stamp-gtktypebuiltins.h \
stamp-gtkmarshalers.h \
gtktypebuiltins_vars.c \
gtktypebuiltins_ids.c \
gtktypebuiltins_evals.c \
gtktypebuiltins.c \
gtkmarshalers.c \
gtkmarshalers.h \
gtkmarshal.c \
......@@ -437,8 +436,6 @@ gtk_built_sources = @STRIP_BEGIN@ \
# their own .lo rules and don't get publically installed
gtk_extra_sources = @STRIP_BEGIN@ \
gtkversion.h.in \
maketypes.awk \
makeenums.h \
gtk-boxed.defs \
gtkmarshalers.list \
gtkmarshal.list \
......@@ -456,44 +453,40 @@ EXTRA_DIST += $(gtk_built_sources)
# rules to generate built sources
#
# setup autogeneration dependancies
gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc
gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc
CLEANFILES = $(gen_sources)
## automake 1.5 supports this without the horrible 'oldest-source-stamp'
## hack below
## automake 1.5 supports this without $(OBJECTS): $(gtk_built_sources) hack
#BUILT_SOURCES = $(gtk_built_sources)
Makefile: oldest-source-stamp # oh boy, does automake SUCK!
oldest-source-stamp: $(gtk_built_sources)
$(OBJECTS): oldest-source-stamp ${gtk_built_public_sources} # this is our oldest file, used for implicit auto-generation deps
$(libgtk_x11_1_3_la_OBJECTS) $(libgtk_linux_fb_1_3_la_OBJECTS) $(libgtk_win32_1_3_la_OBJECTS): ${gtk_built_public_sources}
# initial creation of the real stamp-* files
gtk.defs gtkmarshalers.h gtktypebuiltins.h: # never add deps here
test -f "$(srcdir)/$(@F)" || touch $(srcdir)/$(@F)
# normal autogeneration rules
# all autogenerated files need to be generated in the srcdir,
# so old versions get remade and are not confused with newer
# versions in the build dir. thus a development setup requires
# srcdir to be writable, passing --disable-rebuilds to
# ../configure will supress all autogeneration rules.
$(srcdir)/stamp-gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources)
case @GLIB_MKENUMS@ in \
.*) glib_mkenums=`pwd`/@GLIB_MKENUMS@ ;; \
*) glib_mkenums=@GLIB_MKENUMS@ ;; \
esac; \
cd $(srcdir) \
&& $$glib_mkenums --comments ";; @comment@" \
--fprod "; enumerations from \"@filename@\"\n " \
--vhead "(define-@type@ @EnumName@" \
--vprod " (@valuenick@ @VALUENAME@)" \
--vtail ")" \
$(gtk_public_h_sources) > xgen-gdef \
&& cat gtk-boxed.defs >> xgen-gdef \
&& (cmp -s xgen-gdef gtk.defs || cp xgen-gdef gtk.defs) \
&& rm -f xgen-gdef \
&& echo timestamp > $(@F)
$(srcdir)/stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list gtkmarshalers.h
$(srcdir)/gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources) \
case @GLIB_MKENUMS@ in \
.*) glib_mkenums=`pwd`/@GLIB_MKENUMS@ ;; \
*) glib_mkenums=@GLIB_MKENUMS@ ;; \
esac; \
cd $(srcdir) \
&& $$glib_mkenums --comments ";; @comment@" \
--fprod "; enumerations from \"@filename@\"\n " \
--vhead "(define-@type@ @EnumName@" \
--vprod " (@valuenick@ @VALUENAME@)" \
--vtail ")" \
$(gtk_public_h_sources) > xgen-gdef \
&& cat gtk-boxed.defs >> xgen-gdef \
&& gtk.defs || cp xgen-gdef gtk.defs \
&& rm -f xgen-gdef
all-local: @REBUILD@ gtk.defs
$(srcdir)/gtkmarshalers.h: stamp-gtkmarshalers.h
@true
stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list
case @GLIB_GENMARSHAL@ in \
.*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
......@@ -502,8 +495,8 @@ $(srcdir)/stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list gtkmarshalers.h
&& $$glib_genmarshal --prefix=_gtk_marshal gtkmarshalers.list --header >> xgen-gmlh \
&& (cmp -s xgen-gmlh gtkmarshalers.h || cp xgen-gmlh gtkmarshalers.h) \
&& rm -f xgen-gmlh \
&& echo timestamp > $(@F)
$(srcdir)/gtkmarshalers.c: @REBUILD@ $(srcdir)/stamp-gtkmarshalers.h
&& echo timestamp > $(@F)
$(srcdir)/gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
case @GLIB_GENMARSHAL@ in \
.*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
......@@ -511,8 +504,11 @@ $(srcdir)/gtkmarshalers.c: @REBUILD@ $(srcdir)/stamp-gtkmarshalers.h
cd $(srcdir) \
&& $$glib_genmarshal --prefix=_gtk_marshal gtkmarshalers.list --body >> xgen-gmlc \
&& cp xgen-gmlc gtkmarshalers.c \
&& rm -f xgen-gmlc
$(srcdir)/gtkmarshal.h: @REBUILD@ gtkmarshal.list
&& rm -f xgen-gmlc
$(srcdir)/gtkmarshal.h: stamp-gtkmarshal.h
@true
stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list
case @GLIB_GENMARSHAL@ in \
.*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
......@@ -521,9 +517,10 @@ $(srcdir)/gtkmarshal.h: @REBUILD@ gtkmarshal.list
&& echo "#ifndef GTK_DISABLE_DEPRECATED" > xgen-gmh \
&& $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh \
&& echo "#endif /* GTK_DISABLE_DEPRECATED */" >> xgen-gmh \
&& cp xgen-gmh gtkmarshal.h \
&& rm -f xgen-gmh
$(srcdir)/gtkmarshal.c: @REBUILD@ gtkmarshal.h
&& (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \
&& rm -f xgen-gmh \
&& echo timestamp > $(@F)
$(srcdir)/gtkmarshal.c: @REBUILD@ gtkmarshal.list
case @GLIB_GENMARSHAL@ in \
.*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
......@@ -533,37 +530,28 @@ $(srcdir)/gtkmarshal.c: @REBUILD@ gtkmarshal.h
&& cp xgen-gmc gtkmarshal.c \
&& rm -f xgen-gmc
$(srcdir)/stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs gtktypebuiltins.h
cd $(srcdir) \
&& LC_ALL=C $(AWK) -f maketypes.awk gtk.defs macros > xgen-gtbh \
&& (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h) \
$(srcdir)/gtktypebuiltins.h: stamp-gtktypebuiltins.h
@true
stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile
( cd $(srcdir) && glib-mkenums \
--fhead "#ifndef __GTK_TYPE_BUILTINS_H__\n#define __GTK_TYPE_BUILTINS_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
--fprod "/* enumerations from \"@filename@\" */\n" \
--vhead "GType @enum_name@_get_type (void);\n#define GTK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
--ftail "G_END_DECLS\n\n#endif /* __GTK_TYPE_BUILTINS_H__ */" \
$(gtk_public_h_sources) ) >> xgen-gtbh \
&& (cmp -s xgen-gtbh $(srcdir)/gtktypebuiltins.h || cp xgen-gtbh $(srcdir)/gtktypebuiltins.h ) \
&& rm -f xgen-gtbh \
&& echo timestamp > $(@F)
$(srcdir)/gtktypebuiltins_vars.c: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs
cd $(srcdir) \
&& LC_ALL=C $(AWK) -f maketypes.awk gtk.defs variables > xgen-gtbvc \
&& cp xgen-gtbvc $(@F) \
&& rm -f xgen-gtbvc
$(srcdir)/gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs
cd $(srcdir) \
&& LC_ALL=C $(AWK) -f maketypes.awk gtk.defs entries > xgen-gtbic \
&& cp xgen-gtbic $(@F) \
&& rm -f xgen-gtbic
$(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ $(gtk_public_h_sources)
case @GLIB_MKENUMS@ in \
.*) glib_mkenums=`pwd`/@GLIB_MKENUMS@ ;; \
*) glib_mkenums=@GLIB_MKENUMS@ ;; \
esac; \
cd $(srcdir) \
&& $$glib_mkenums \
$(srcdir)/gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile
( cd $(srcdir) && glib-mkenums \
--fhead "#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "static const GtkEnumValue _@enum_name@_values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n};" \
$(gtk_public_h_sources) > xgen-gtbec \
&& cp xgen-gtbec $(@F) \
&& rm -f xgen-gtbec
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
$(gtk_public_h_sources) ) > xgen-gtbc \
&& cp xgen-gtbc $(srcdir)/gtktypebuiltins.c \
&& rm -f xgen-gtbc
# target platform:
lib_LTLIBRARIES = $(gtktargetlib)
......
#!/usr/bin/perl -w
#
# by Elliot Lee <sopwith@redhat.com>
%trans = ( "NONE"=>"void", "CHAR"=>"char",
"BOOL"=>"gboolean", "INT"=>"gint",
"UINT"=>"guint", "LONG"=>"glong",
"ULONG"=>"gulong", "FLOAT"=>"gfloat",
"DOUBLE"=>"gdouble", "STRING"=>"gpointer",
"ENUM"=>"gint", "FLAGS"=>"gint",
"BOXED"=>"gpointer",
"POINTER"=>"gpointer",
"OBJECT"=>"gpointer",
# complex types. These need special handling.
"SIGNAL"=>"SIGNAL"
);
if ($#ARGV != 2) {
die ("Wrong number of arguments given, need <source> <target.h> <target.c>");
}
open(IL, "<" . $ARGV[0]) || die ("Open failed: $!");
open(OH, ">" . $ARGV[1]) || die ("Open failed: $!");
open(OS, ">" . $ARGV[2]) || die ("Open failed: $!");
print OH <<EOT;
#ifndef __GTK_MARSHAL_H__
#define __GTK_MARSHAL_H__
#include <gtk/gtktypeutils.h>
#include <gtk/gtkobject.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#define gtk_signal_default_marshaller gtk_marshal_NONE__NONE
EOT
print OS qq(#include "gtkmarshal.h"\n\n);
while (defined($aline = <IL>)) {
chomp $aline;
($retval, $paramlist) = split(/:/, $aline, 2);
@params = split(/\s*,\s*/, $paramlist);
my $funcname = $retval."__".join("_",@params);
my $defname;
next if (exists $defs{$funcname});
$doequiv = 0;
for (@params, $retval) {
if ($trans{$_} eq "gpointer" && $_ ne "POINTER") {
$doequiv = 1;
last;
}
if($_ eq "ENUM" || $_ eq "UINT" || $_ eq "ULONG") {
$doequiv = 1;
last;
}
}
# Translate all function pointers to gpointer
$defname = $funcname;
if($doequiv) {
print OH "#define gtk_marshal_$funcname ";
$defs{$defname} = 1;
for (@params, $retval) {
if ($trans{$_} eq "gpointer") {
$_ = "POINTER";
}
if($_ eq "ENUM") {
$_ = "UINT";
}
if($_ eq "UINT") {
$_ = "INT"; # Unvalidated assumption - please check
}
if($_ eq "ULONG") {
$_ = "LONG";
}
}
$funcname = $retval."__".join("_",@params);
print OH "gtk_marshal_$funcname\n\n";
next if (exists $defs{$funcname});
}
$defs{$funcname} = 1;
print OH <<EOT;
void gtk_marshal_$funcname (GtkObject *object,
GtkSignalFunc func,
gpointer func_data,
GtkArg *args);
EOT
print OS "typedef $trans{$retval} (*GtkSignal_$funcname) (GtkObject *object, \n";
$argn = 1;
for (@params) {
if($_ eq "SIGNAL") {
print OS "gpointer arg".$argn."a,\n";
print OS "gpointer arg".$argn."b,\n";
$argn++;
} else {
print OS "$trans{$_} arg".$argn++.",\n" unless $_ eq "NONE";
}
}
print OS "gpointer user_data);\n";
print OS <<EOT;
void gtk_marshal_$funcname (GtkObject *object,
GtkSignalFunc func,
gpointer func_data,
GtkArg *args)
{
GtkSignal_$funcname rfunc;
EOT
if($retval ne "NONE") {
print OS " $trans{$retval} *return_val;\n";
$retn = 0;
$retn = scalar @params unless $params[0] eq "NONE";
print OS " return_val = GTK_RETLOC_$retval (args[$retn]);\n";
}
print OS " rfunc = (GtkSignal_$funcname) func;\n";
print OS " *return_val = " unless $retval eq "NONE";
print OS " (* rfunc) (object,\n";
for($i = 0; $i < (scalar @params); $i++) {
if ($params[$i] eq "SIGNAL") {
print OS <<EOT;
GTK_VALUE_SIGNAL(args[$i]).f,
GTK_VALUE_SIGNAL(args[$i]).d,
EOT
} elsif ($params[$i] eq "NONE") {
} else {
print OS " GTK_VALUE_$params[$i](args[$i]),\n";
}
}
print OS " func_data);\n}\n\n";
}
print OH <<EOT;
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GTK_MARSHAL_H__ */
EOT
close(IL); close(OH); close(OS);
EXPORTS
GTK_TYPE_ACCEL_FLAGS
GTK_TYPE_ANCHOR_TYPE
GTK_TYPE_ARG_FLAGS
GTK_TYPE_ARROW_TYPE
GTK_TYPE_ATTACH_OPTIONS
GTK_TYPE_BORDER
GTK_TYPE_BUTTONS_TYPE
GTK_TYPE_BUTTON_ACTION
GTK_TYPE_BUTTON_BOX_STYLE
GTK_TYPE_CALENDAR_DISPLAY_OPTIONS
GTK_TYPE_CELL_RENDERER_MODE
GTK_TYPE_CELL_RENDERER_STATE
GTK_TYPE_CELL_TYPE
GTK_TYPE_CLIST_DRAG_POS
GTK_TYPE_CORNER_TYPE
GTK_TYPE_CTREE_EXPANDER_STYLE
GTK_TYPE_CTREE_EXPANSION_TYPE
GTK_TYPE_CTREE_LINE_STYLE
GTK_TYPE_CTREE_POS
GTK_TYPE_CURVE_TYPE
GTK_TYPE_DEBUG_FLAG
GTK_TYPE_DELETE_TYPE
GTK_TYPE_DEST_DEFAULTS
GTK_TYPE_DIALOG_FLAGS
GTK_TYPE_DIRECTION_TYPE
GTK_TYPE_EXPANDER_STYLE
GTK_TYPE_ICON_SET
GTK_TYPE_ICON_SIZE
GTK_TYPE_IMAGE_TYPE
GTK_TYPE_JUSTIFICATION
GTK_TYPE_MATCH_TYPE
GTK_TYPE_MENU_DIRECTION_TYPE
GTK_TYPE_MESSAGE_TYPE
GTK_TYPE_METRIC_TYPE
GTK_TYPE_MOVEMENT_STEP
GTK_TYPE_NOTEBOOK_TAB
GTK_TYPE_OBJECT_FLAGS
GTK_TYPE_ORIENTATION
GTK_TYPE_PACK_TYPE
GTK_TYPE_PATH_PRIORITY_TYPE
GTK_TYPE_PATH_TYPE
GTK_TYPE_POLICY_TYPE
GTK_TYPE_POSITION_TYPE
GTK_TYPE_PREVIEW_TYPE
GTK_TYPE_PRIVATE_FLAGS
GTK_TYPE_PROGRESS_BAR_ORIENTATION
GTK_TYPE_PROGRESS_BAR_STYLE
GTK_TYPE_RC_FLAGS
GTK_TYPE_RC_TOKEN_TYPE
GTK_TYPE_RELIEF_STYLE
GTK_TYPE_REQUISITION
GTK_TYPE_RESIZE_MODE
GTK_TYPE_RESPONSE_TYPE
GTK_TYPE_SCROLL_TYPE
GTK_TYPE_SELECTION_DATA
GTK_TYPE_SELECTION_MODE
GTK_TYPE_SHADOW_TYPE
GTK_TYPE_SIDE_TYPE
GTK_TYPE_SIGNAL_RUN_TYPE
GTK_TYPE_SIZE_GROUP_MODE
GTK_TYPE_SORT_TYPE
GTK_TYPE_SPIN_BUTTON_UPDATE_POLICY
GTK_TYPE_SPIN_TYPE
GTK_TYPE_STATE_TYPE
GTK_TYPE_SUBMENU_DIRECTION
GTK_TYPE_SUBMENU_PLACEMENT
GTK_TYPE_TARGET_FLAGS
GTK_TYPE_TEXT_ATTRIBUTES
GTK_TYPE_TEXT_DIRECTION
GTK_TYPE_TEXT_ITER
GTK_TYPE_TEXT_WINDOW_TYPE
GTK_TYPE_TOOLBAR_CHILD_TYPE
GTK_TYPE_TOOLBAR_SPACE_STYLE
GTK_TYPE_TOOLBAR_STYLE
GTK_TYPE_TREE_ITER
GTK_TYPE_TREE_MODEL_FLAGS
GTK_TYPE_TREE_PATH
GTK_TYPE_TREE_VIEW_COLUMN_SIZING
GTK_TYPE_TREE_VIEW_DROP_POSITION
GTK_TYPE_TREE_VIEW_MODE
GTK_TYPE_UPDATE_TYPE
GTK_TYPE_VISIBILITY
GTK_TYPE_WIDGET_FLAGS
GTK_TYPE_WIDGET_HELP_TYPE
GTK_TYPE_WINDOW_POSITION
GTK_TYPE_WINDOW_TYPE
GTK_TYPE_WRAP_MODE
gtk_accel_flags_get_type
gtk_anchor_type_get_type
gtk_arg_flags_get_type
gtk_arrow_type_get_type
gtk_attach_options_get_type
gtk_buttons_type_get_type
gtk_button_action_get_type
gtk_button_box_style_get_type
gtk_calendar_display_options_get_type
gtk_cell_renderer_mode_get_type
gtk_cell_renderer_state_get_type
gtk_cell_type_get_type
gtk_clist_drag_pos_get_type
gtk_corner_type_get_type
gtk_ctree_expander_style_get_type
gtk_ctree_expansion_type_get_type
gtk_ctree_line_style_get_type
gtk_ctree_pos_get_type
gtk_curve_type_get_type
gtk_debug_flag_get_type
gtk_delete_type_get_type
gtk_dest_defaults_get_type
gtk_dialog_flags_get_type
gtk_direction_type_get_type
gtk_expander_style_get_type
gtk_icon_size_get_type
gtk_image_type_get_type
gtk_justification_get_type
gtk_match_type_get_type
gtk_menu_direction_type_get_type
gtk_message_type_get_type
gtk_metric_type_get_type
gtk_movement_step_get_type
gtk_notebook_tab_get_type
gtk_object_flags_get_type
gtk_orientation_get_type
gtk_pack_type_get_type
gtk_path_priority_type_get_type
gtk_path_type_get_type
gtk_policy_type_get_type
gtk_position_type_get_type
gtk_preview_type_get_type
gtk_private_flags_get_type
gtk_progress_bar_orientation_get_type
gtk_progress_bar_style_get_type
gtk_rc_flags_get_type
gtk_rc_token_type_get_type
gtk_relief_style_get_type
gtk_resize_mode_get_type
gtk_response_type_get_type
gtk_scroll_type_get_type
gtk_selection_mode_get_type
gtk_shadow_type_get_type
gtk_side_type_get_type
gtk_signal_run_type_get_type
gtk_size_group_mode_get_type
gtk_sort_type_get_type
gtk_spin_button_update_policy_get_type
gtk_spin_type_get_type
gtk_state_type_get_type
gtk_submenu_direction_get_type
gtk_submenu_placement_get_type
gtk_target_flags_get_type
gtk_text_direction_get_type
gtk_text_search_flags_get_type
gtk_text_window_type_get_type
gtk_toolbar_child_type_get_type
gtk_toolbar_space_style_get_type
gtk_toolbar_style_get_type
gtk_tree_model_flags_get_type
gtk_tree_view_column_sizing_get_type
gtk_tree_view_drop_position_get_type
gtk_tree_view_mode_get_type
gtk_update_type_get_type
gtk_visibility_get_type
gtk_widget_flags_get_type
gtk_widget_help_type_get_type
gtk_window_position_get_type
gtk_window_type_get_type
gtk_wrap_mode_get_type
gtk_accel_group_connect
gtk_accel_group_connect_by_path
......@@ -157,6 +150,7 @@ EXPORTS
gtk_bindings_activate
gtk_border_copy
gtk_border_free
gtk_border_get_type
gtk_box_get_homogeneous
gtk_box_get_spacing
gtk_box_get_type
......@@ -678,6 +672,7 @@ EXPORTS
gtk_icon_set_add_source
gtk_icon_set_copy
gtk_icon_set_get_sizes
gtk_icon_set_get_type
gtk_icon_set_new
gtk_icon_set_new_from_pixbuf
gtk_icon_set_ref
......@@ -698,6 +693,7 @@ EXPORTS
gtk_icon_source_get_size_wildcarded
gtk_icon_source_get_state
gtk_icon_source_get_state_wildcarded
gtk_icon_source_get_type
gtk_icon_source_new
gtk_icon_source_set_direction
gtk_icon_source_set_direction_wildcarded
......@@ -1203,6 +1199,7 @@ EXPORTS
gtk_rc_style_unref
gtk_requisition_copy
gtk_requisition_free
gtk_requisition_get_type
gtk_rgb_to_hsv
gtk_ruler_draw_pos
gtk_ruler_draw_ticks
......@@ -1241,6 +1238,7 @@ EXPORTS
gtk_selection_data_free
gtk_selection_data_get_targets
gtk_selection_data_get_text
gtk_selection_data_get_type
gtk_selection_data_set
gtk_selection_data_set_text
gtk_selection_data_targets_include_text
......@@ -1363,6 +1361,7 @@ EXPORTS
gtk_text_anchored_child_set_layout
gtk_text_attributes_copy
gtk_text_attributes_copy_values
gtk_text_attributes_get_type
gtk_text_attributes_new
gtk_text_attributes_ref
gtk_text_attributes_unref
......@@ -1493,6 +1492,7 @@ EXPORTS
gtk_text_iter_get_tags
gtk_text_iter_get_text
gtk_text_iter_get_toggled_tags
gtk_text_iter_get_type
gtk_text_iter_get_visible_line_index
gtk_text_iter_get_visible_line_offset
gtk_text_iter_get_visible_slice
......@@ -1718,6 +1718,7 @@ EXPORTS