Commit 486362db authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Update to libtool-1.2b, change library versioning scheme to drop

Tue Sep 15 14:57:30 1998  Owen Taylor  <otaylor@redhat.com>

	* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
	change library versioning scheme to drop LT_RELEASE
	from the -l line, while keeping it in the soname.

Tue Sep 15 14:10:33 1998  Owen Taylor  <otaylor@redhat.com>

	* configure.in Makefile.in: define a MAINT-like variable REBUILD
	which is set if Perl and awk are found, and autogenerated sources
	can be rebuilt. Remove the auto-generated sources from
	CVS.

	Add dependencies so that the autogenerated sources are
	rebuilt if the files they depend on change.
	(This unfortunately currently results in the entire
	gtk/ directory being rebuilt when any header changes.
	Moving all enums to gtkenums.h would fix this.)
parent ee1b9618
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
change library versioning scheme to drop LT_RELEASE
from the -l line, while keeping it in the soname.
Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.in: define a MAINT-like variable REBUILD
which is set if Perl and awk are found, and autogenerated sources
can be rebuilt. Remove the auto-generated sources from
CVS.
Add dependencies so that the autogenerated sources are
rebuilt if the files they depend on change.
(This unfortunately currently results in the entire
gtk/ directory being rebuilt when any header changes.
Moving all enums to gtkenums.h would fix this.)
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and
......@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
-- the widget argument is NULL for the first radio button in the
group.
>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes
......
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
change library versioning scheme to drop LT_RELEASE
from the -l line, while keeping it in the soname.
Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.in: define a MAINT-like variable REBUILD
which is set if Perl and awk are found, and autogenerated sources
can be rebuilt. Remove the auto-generated sources from
CVS.
Add dependencies so that the autogenerated sources are
rebuilt if the files they depend on change.
(This unfortunately currently results in the entire
gtk/ directory being rebuilt when any header changes.
Moving all enums to gtkenums.h would fix this.)
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and
......@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
-- the widget argument is NULL for the first radio button in the
group.
>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes
......
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
change library versioning scheme to drop LT_RELEASE
from the -l line, while keeping it in the soname.
Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.in: define a MAINT-like variable REBUILD
which is set if Perl and awk are found, and autogenerated sources
can be rebuilt. Remove the auto-generated sources from
CVS.
Add dependencies so that the autogenerated sources are
rebuilt if the files they depend on change.
(This unfortunately currently results in the entire
gtk/ directory being rebuilt when any header changes.
Moving all enums to gtkenums.h would fix this.)
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and
......@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
-- the widget argument is NULL for the first radio button in the
group.
>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes
......
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
change library versioning scheme to drop LT_RELEASE
from the -l line, while keeping it in the soname.
Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.in: define a MAINT-like variable REBUILD
which is set if Perl and awk are found, and autogenerated sources
can be rebuilt. Remove the auto-generated sources from
CVS.
Add dependencies so that the autogenerated sources are
rebuilt if the files they depend on change.
(This unfortunately currently results in the entire
gtk/ directory being rebuilt when any header changes.
Moving all enums to gtkenums.h would fix this.)
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and
......@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
-- the widget argument is NULL for the first radio button in the
group.
>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes
......
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
change library versioning scheme to drop LT_RELEASE
from the -l line, while keeping it in the soname.
Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.in: define a MAINT-like variable REBUILD
which is set if Perl and awk are found, and autogenerated sources
can be rebuilt. Remove the auto-generated sources from
CVS.
Add dependencies so that the autogenerated sources are
rebuilt if the files they depend on change.
(This unfortunately currently results in the entire
gtk/ directory being rebuilt when any header changes.
Moving all enums to gtkenums.h would fix this.)
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and
......@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
-- the widget argument is NULL for the first radio button in the
group.
>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes
......
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
change library versioning scheme to drop LT_RELEASE
from the -l line, while keeping it in the soname.
Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.in: define a MAINT-like variable REBUILD
which is set if Perl and awk are found, and autogenerated sources
can be rebuilt. Remove the auto-generated sources from
CVS.
Add dependencies so that the autogenerated sources are
rebuilt if the files they depend on change.
(This unfortunately currently results in the entire
gtk/ directory being rebuilt when any header changes.
Moving all enums to gtkenums.h would fix this.)
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and
......@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
-- the widget argument is NULL for the first radio button in the
group.
>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes
......
Tue Sep 15 14:57:30 1998 Owen Taylor <otaylor@redhat.com>
* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
change library versioning scheme to drop LT_RELEASE
from the -l line, while keeping it in the soname.
Tue Sep 15 14:10:33 1998 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.in: define a MAINT-like variable REBUILD
which is set if Perl and awk are found, and autogenerated sources
can be rebuilt. Remove the auto-generated sources from
CVS.
Add dependencies so that the autogenerated sources are
rebuilt if the files they depend on change.
(This unfortunately currently results in the entire
gtk/ directory being rebuilt when any header changes.
Moving all enums to gtkenums.h would fix this.)
Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
* gtk/gtkobject.h: added gtk_object_set_data_destroy and
......@@ -15,6 +34,7 @@ Thu Sep 17 05:12:48 1998 Tim Janik <timj@gtk.org>
-- the widget argument is NULL for the first radio button in the
group.
>>>>>>> 1.636
Tue Sep 15 13:09:24 1998 Owen Taylor <otaylor@redhat.com>
* gdk/gdkimage.c (gdk_image_new): Reverted global changes
......
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -478,10 +478,10 @@ EOF
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
exit 0 ;;
i*:CYGWIN*:*)
echo i386-pc-cygwin32
echo ${UNAME_MACHINE}-pc-cygwin32
exit 0 ;;
i*:MINGW*:*)
echo i386-pc-mingw32
echo ${UNAME_MACHINE}-pc-mingw32
exit 0 ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin32
......@@ -493,6 +493,12 @@ EOF
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;;
*:Linux:*:*)
# uname on the ARM produces all sorts of strangeness, and we need to
# filter it out.
case "$UNAME_MACHINE" in
arm* | sa110*) UNAME_MACHINE="arm" ;;
esac
# The BFD linker knows what the default object file format is, so
# first see if it will tell us.
ld_help_string=`ld --help 2>&1`
......@@ -506,6 +512,7 @@ EOF
i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;;
i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;;
sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;;
esac
......
#! /bin/sh
# Configuration validation subroutine script, version 1.1.
# Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine. It does not imply ALL GNU software can.
......@@ -162,7 +162,7 @@ case $basic_machine in
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
i[3456]86)
i[34567]86)
basic_machine=$basic_machine-pc
;;
# Object if more than one company name word.
......@@ -171,7 +171,7 @@ case $basic_machine in
exit 1
;;
# Recognize the basic CPU types with company name.
vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \
vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
| power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
......@@ -350,19 +350,19 @@ case $basic_machine in
os=-mvs
;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i[3456]86v32)
i[34567]86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
;;
i[3456]86v4*)
i[34567]86v4*)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv4
;;
i[3456]86v)
i[34567]86v)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv
;;
i[3456]86sol2)
i[34567]86sol2)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-solaris2
;;
......@@ -469,25 +469,23 @@ case $basic_machine in
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
pentium | p5)
basic_machine=i586-intel
pentium | p5 | k5 | nexen)
basic_machine=i586-pc
;;
pentiumpro | p6)
basic_machine=i686-intel
pentiumpro | p6 | k6 | 6x86)
basic_machine=i686-pc
;;
pentium-* | p5-*)
pentiumii | pentium2)
basic_machine=i786-pc
;;
pentium-* | p5-* | k5-* | nexen-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-*)
pentiumpro-* | p6-* | k6-* | 6x86-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
k5)
# We don't have specific support for AMD's K5 yet, so just call it a Pentium
basic_machine=i586-amd
;;
nexen)
# We don't have specific support for Nexgen yet, so just call it a Pentium
basic_machine=i586-nexgen
pentiumii-* | pentium2-*)
basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pn)
basic_machine=pn-gould
......
......@@ -107,8 +107,24 @@ if test "x$GCC" = "xyes"; then
fi
fi
dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R)
# define a MAINT-like variable REBUILD which is set if Perl
# and awk are found, so autogenerated sources can be rebuilt
AC_PROG_AWK
AC_CHECK_PROGS(PERL, perl5 perl)
REBUILD=\#
if test -n "$PERL" && perl -v | grep 'version 5.' > /dev/null ; then
if test -n "$AWK" ; then
REBUILD=
fi
fi
AC_SUBST(REBUILD)
dnl The DU4 header files don't provide library prototypes unless
dnl -std1 is given to the native cc.
AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
gtk_save_LIBS=$LIBS
LIBS="$LIBS -lm"
AC_TRY_RUN([#include <math.h>
......
......@@ -2,10 +2,10 @@
gdkincludedir = $(includedir)/gdk
lib_LTLIBRARIES = libgdk-1.1.la
lib_LTLIBRARIES = libgdk.la
DEFS += -DG_LOG_DOMAIN=\"Gdk\"
libgdk_1_1_la_SOURCES = \
libgdk_la_SOURCES = \
gdk.c \
gdkcc.c \
gdkcolor.c \
......@@ -50,9 +50,9 @@ gdkinclude_HEADERS = \
gdktypes.h \
gdkx.h
libgdk_1_1_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
@x_ldflags@ @x_libs@
libgdk_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
@x_ldflags@ @x_libs@
INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@
......
......@@ -64,7 +64,7 @@ while test $# -gt 0; do
fi
fi
done
echo $libdirs @x_ldflags@ -lgtk-@LT_RELEASE@ -lgdk-@LT_RELEASE@ $my_glib_libs @x_libs@ -lm
echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @x_libs@ -lm
;;
*)
echo "${usage}" 1>&2
......
......@@ -3,9 +3,9 @@
gtkincludedir = $(includedir)/gtk
DEFS += -DG_LOG_DOMAIN=\"Gtk\"
lib_LTLIBRARIES = libgtk-1.1.la
lib_LTLIBRARIES = libgtk.la
libgtk_1_1_la_SOURCES = \
libgtk_la_SOURCES = \
gtkaccelgroup.c \
gtkaccellabel.c \
gtkadjustment.c \
......@@ -107,7 +107,8 @@ libgtk_1_1_la_SOURCES = \
fnmatch.c \
fnmatch.h
gtkinclude_HEADERS = \
# Source headers are are non-autogenerated headers
source_headers = \
gtk.h \
gtkaccelgroup.h \
gtkaccellabel.h \
......@@ -160,7 +161,6 @@ gtkinclude_HEADERS = \
gtklist.h \
gtklistitem.h \
gtkmain.h \
gtkmarshal.h \
gtkmenu.h \
gtkmenubar.h \
gtkmenufactory.h \
......@@ -210,61 +210,71 @@ gtkinclude_HEADERS = \
gtkvscrollbar.h \
gtkvseparator.h \
gtkwidget.h \
gtkwindow.h \
gtkwindow.h
gtkinclude_HEADERS = \
$(source_headers) \
gtkmarshal.h \
gtktypebuiltins.h
.PHONY: auto-files auto-files-1
auto-files:
rm -f $(srcdir)/gtk.defs
$(MAKE) auto-files-1
BUILT_SOURCES = \
gtktypebuiltins.h \
gtktypebuiltins_evals.c \
gtktypebuiltins_ids.c \
gtktypebuiltins_vars.c \
gtkmarshal.c \
gtkmarshal.h
auto-files-1: gtk.defs
auto-files-1: gtktypebuiltins_evals.c gtktypebuiltins_ids.c
auto-files-1: gtktypebuiltins_vars.c gtktypebuiltins.h
# More headers to use when autogenerating.
gdk_headers = \
$(top_srcdir)/gdk/gdktypes.h \
$(top_srcdir)/gdk/gdkrgb.h
# generate gtk.defs file from gtk-boxed.defs and *.h
gtk.defs: @MAINT@ makeenums.pl gtk-boxed.defs
gtk.defs: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
src_headers=`echo $(source_headers) | sed s%gtk%$(srcdir)/gtk%` ; \
srcdir=$(srcdir) \
perl $(srcdir)/makeenums.pl defs $(srcdir)/gtk*.h \
$(top_srcdir)/gdk/gdk*.h > gd.tmp
perl $(srcdir)/makeenums.pl defs $$src_headers \
$(gdk_headers) > gd.tmp
cat $(srcdir)/gtk-boxed.defs >> gd.tmp
cp gd.tmp $(srcdir)/gtk.defs
rm -f gd.tmp
# generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
gtktypebuiltins.h: @MAINT@ gtk.defs maketypes.awk
gtktypebuiltins.h: @REBUILD@ gtk.defs maketypes.awk
awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs macros > gtb.tmp
cp gtb.tmp $(srcdir)/gtktypebuiltins.h
rm -f gtb.tmp
# generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
gtktypebuiltins_vars.c: @MAINT@ gtk.defs maketypes.awk
gtktypebuiltins_vars.c: @REBUILD@ gtk.defs maketypes.awk
awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs variables > gtbv.tmp
cp gtbv.tmp $(srcdir)/gtktypebuiltins_vars.c
rm -f gtbv.tmp
# generate type entries for type-id registration
gtktypebuiltins_ids.c: @MAINT@ gtk.defs maketypes.awk
gtktypebuiltins_ids.c: @REBUILD@ gtk.defs maketypes.awk
awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs entries > gtbi.tmp
cp gtbi.tmp $(srcdir)/gtktypebuiltins_ids.c
rm -f gtbi.tmp
# generate enum value arrays
gtktypebuiltins_evals.c: @MAINT@ makeenums.pl gtk.defs
gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl gtk.defs
srcdir=$(srcdir) \
perl $(srcdir)/makeenums.pl arrays $(srcdir)/gtk*.h \
$(top_srcdir)/gdk/gdk*.h > gtbe.tmp
cp gtbe.tmp $(srcdir)/gtktypebuiltins_evals.c
rm -f gtbe.tmp
gtkmarshal.c gtkmarshal.h: @MAINT@ gtkmarshal.list genmarshal.pl
gtkmarshal.c gtkmarshal.h: @REBUILD@ gtkmarshal.list genmarshal.pl
srcdir=$(srcdir) perl $(srcdir)/genmarshal.pl
# ???
# special remake rules
makeenums.h: @MAINT@ gtk.h gtkprivate.h
# makeenums.h: @REBUILD@ gtk.h gtkprivate.h
libgtk_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
libgtk_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
EXTRA_DIST = \
line-arrow.xbm \
......@@ -300,15 +310,13 @@ INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@
noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb simple
# FIXME, we currently rely on linking against libglib-1.1
DEPS = \
libgtk-@LT_RELEASE@.la \
$(top_builddir)/gdk/libgdk-@LT_RELEASE@.la
libgtk.la \
$(top_builddir)/gdk/libgdk.la
LDADDS = \
libgtk-@LT_RELEASE@.la \
$(top_builddir)/gdk/libgdk-@LT_RELEASE@.la \
libgtk.la \
$(top_builddir)/gdk/libgdk.la \
@x_ldflags@ \
@x_libs@ \
@GLIB_LIBS@ \
......
;; generated by makeenums.pl ; -*- scheme -*-
; enumerations from "./gtkclist.h"
; enumerations from "gtkclist.h"
(define-enum GtkCellType
(empty GTK_CELL_EMPTY)
......@@ -10,7 +10,7 @@
(pixtext GTK_CELL_PIXTEXT)
(widget GTK_CELL_WIDGET))
; enumerations from "./gtkctree.h"
; enumerations from "gtkctree.h"
(define-enum GtkCTreePos
(before GTK_CTREE_POS_BEFORE)
......@@ -31,14 +31,14 @@
(toggle GTK_CTREE_EXPANSION_TOGGLE)
(toggle-recursive GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE))
; enumerations from "./gtkdebug.h"
; enumerations from "gtkdebug.h"
(define-flags GtkDebugFlag
(objects GTK_DEBUG_OBJECTS)
(misc GTK_DEBUG_MISC)
(signals GTK_DEBUG_SIGNALS))
; enumerations from "./gtkenums.h"
; enumerations from "gtkenums.h"
(define-flags GtkAccelFlags
(visible GTK_ACCEL_VISIBLE)
......@@ -231,13 +231,13 @@
(ascending GTK_SORT_ASCENDING)
(descending GTK_SORT_DESCENDING))
; enumerations from "./gtkfontsel.h"
; enumerations from "gtkfontsel.h"
(define-enum GtkFontMetricType
(ixels-metric PIXELS_METRIC)
(oints-metric POINTS_METRIC))
; enumerations from "./gtkobject.h"
; enumerations from "gtkobject.h"
(define-flags GtkObjectFlags
(destroyed GTK_DESTROYED)
......@@ -254,7 +254,7 @@
(mask GTK_ARG_MASK)
(readwrite GTK_ARG_READWRITE))
; enumerations from "./gtkpacker.h"
; enumerations from "gtkpacker.h"
(define-flags GtkPackerOptions
(expand GTK_PACK_EXPAND)
......@@ -286,7 +286,7 @@
(w GTK_ANCHOR_W)
(e GTK_ANCHOR_E))
; enumerations from "./gtkprivate.h"
; enumerations from "gtkprivate.h"
(define-flags GtkPrivateFlags
(user-style PRIVATE_GTK_USER_STYLE)
......@@ -297,7 +297,7 @@
(has-shape-mask PRIVATE_GTK_HAS_SHAPE_MASK)
(in-reparent PRIVATE_GTK_IN_REPARENT))
; enumerations from "./gtkprogressbar.h"
; enumerations from "gtkprogressbar.h"
(define-enum GtkProgressBarStyle
(continuous GTK_PROGRESS_CONTINUOUS)
......@@ -309,7 +309,7 @@
(bottom-to-top GTK_PROGRESS_BOTTOM_TO_TOP)
(top-to-bottom GTK_PROGRESS_TOP_TO_BOTTOM))
; enumerations from "./gtkrc.h"
; enumerations from "gtkrc.h"
(define-enum GtkRcTokenType
(invalid GTK_RC_TOKEN_INVALID)
......@@ -340,7 +340,7 @@
(highest GTK_RC_TOKEN_HIGHEST)
(last GTK_RC_TOKEN_LAST))
; enumerations from "./gtkspinbutton.h"
; enumerations from "gtkspinbutton.h"
(define-enum GtkSpinButtonUpdatePolicy
(always GTK_UPDATE_ALWAYS)
......@@ -355,7 +355,7 @@
(end GTK_SPIN_END)
(user-defined GTK_SPIN_USER_DEFINED))
; enumerations from "./gtktoolbar.h"
; enumerations from "gtktoolbar.h"
(define-enum GtkToolbarChildType
(space GTK_TOOLBAR_CHILD_SPACE)
......@@ -364,13 +364,13 @@
(radiobutton GTK_TOOLBAR_CHILD_RADIOBUTTON)
(widget GTK_TOOLBAR_CHILD_WIDGET))
; enumerations from "./gtktree.h"
; enumerations from "gtktree.h"
(define-enum GtkTreeViewMode
(line GTK_TREE_VIEW_LINE)
(item GTK_TREE_VIEW_ITEM))
; enumerations from "./gtktypeutils.h"
; enumerations from "gtktypeutils.h"
(define-enum GtkFundamentalType
(invalid GTK_TYPE_INVALID)
......@@ -396,7 +396,7 @@
(foreign GTK_TYPE_FOREIGN)
(object GTK_TYPE_OBJECT))
; enumerations from "./gtkwidget.h"
; enumerations from "gtkwidget.h"
(define-flags GtkWidgetFlags
(toplevel GTK_TOPLEVEL)
......@@ -415,25 +415,6 @@
(composite-child GTK_COMPOSITE_CHILD)
(basic GTK_BASIC))
; enumerations from "../gdk/gdkprivate.h"
(define-flags GdkColorInfoFlags
(writeable GDK_COLOR_WRITEABLE))
(define-flags GdkDebugFlag
(misc GDK_DEBUG_MISC)
(events GDK_DEBUG_EVENTS)
(dnd GDK_DEBUG_DND)
(color-context GDK_DEBUG_COLOR_CONTEXT)
(xim GDK_DEBUG_XIM))
; enumerations from "../gdk/gdkrgb.h"
(define-enum GdkRgbDither
(none GDK_RGB_DITHER_NONE)
(normal GDK_RGB_DITHER_NORMAL)
(max GDK_RGB_DITHER_MAX))
; enumerations from "../gdk/gdktypes.h"
(define-enum GdkWindowType
......@@ -854,6 +835,13 @@
(in GDK_OVERLAP_RECTANGLE_IN)
(out GDK_OVERLAP_RECTANGLE_OUT)
(part GDK_OVERLAP_RECTANGLE_PART))
; enumerations from "../gdk/gdkrgb.h"
(define-enum GdkRgbDither
(none GDK_RGB_DITHER_NONE)
(normal GDK_RGB_DITHER_NORMAL)
(max GDK_RGB_DITHER_MAX))
;; -*- scheme -*-
......
#include "gtkmarshal.h"
typedef gboolean (*GtkSignal_BOOL__NONE) (GtkObject * object,
gpointer user_data);
void
gtk_marshal_BOOL__NONE (GtkObject * object,
GtkSignalFunc func,
gpointer func_data,
GtkArg * args)
{
GtkSignal_BOOL__NONE rfunc;
gboolean *return_val;
return_val = GTK_RETLOC_BOOL (args[0]);
rfunc = (GtkSignal_BOOL__NONE) func;
*return_val = (*rfunc) (object,
func_data);
}
typedef gboolean (*GtkSignal_BOOL__POINTER) (GtkObject * object,
gpointer arg1,
gpointer user_data);
void
gtk_marshal_BOOL__POINTER (GtkObject * object,
GtkSignalFunc func,
gpointer func_data,
GtkArg * args)
{
GtkSignal_BOOL__POINTER rfunc;
gboolean *return_val;
return_val = GTK_RETLOC_BOOL (args[1]);
rfunc = (GtkSignal_BOOL__POINTER) func;
*return_val = (*rfunc) (object,
GTK_VALUE_POINTER (args[0]),
func_data);
}
typedef gboolean (*GtkSignal_BOOL__POINTER_POINTER_INT_INT) (GtkObject * object,
gpointer arg1,
gpointer arg2,
gint arg3,
gint arg4,
gpointer user_data);
void
gtk_marshal_BOOL__POINTER_POINTER_INT_INT (GtkObject * object,
GtkSignalFunc func,
gpointer func_data,
GtkArg * args)
{
GtkSignal_BOOL__POINTER_POINTER_INT_INT rfunc;
gboolean *return_val;
return_val = GTK_RETLOC_BOOL (args[4]);
rfunc = (GtkSignal_BOOL__POINTER_POINTER_INT_INT) func;
*return_val = (*rfunc) (object,
GTK_VALUE_POINTER (args[0]),
GTK_VALUE_POINTER (args[1]),
GTK_VALUE_INT (args[2]),
GTK_VALUE_INT (args[3]),
func_data);
}
typedef gboolean (*GtkSignal_BOOL__POINTER_POINTER_POINTER_POINTER) (GtkObject * object,
gpointer arg1,
gpointer arg2,
gpointer arg3,
gpointer arg4,
gpointer user_data);
void
gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER (GtkObject * object,
GtkSignalFunc func,
gpointer func_data,
GtkArg * args)
{