forked from AuroraMiddleware/gtk
86b5c82a97
2000-10-23 Havoc Pennington <hp@redhat.com>
* gtk/testtext.c: Re-enable the "find" dialog
* gtk/testgtk.c: Add test for gdk_drawable_get_image
* gdk/gdkwindow.c (gdk_window_begin_paint_region): Fix bug where
the arguments to gdk_draw_drawable were in the wrong order
(gdk_window_paint_init_bg): This function was ignoring the
init_region, instead of clipping to it, so the entire backing
pixmap was cleared on every begin_paint()
(gdk_window_begin_paint_region): Hmm, the same list-walking bug
was in here again, the loop kept using the same GtkWindowPaint
over and over.
(gdk_window_begin_paint_region): Fix a bug where we had two
x_offset instead of x_offset and y_offset
* gdk/gdkdraw.c (gdk_drawable_get_image): get composite drawable
before we get the image.
(gdk_draw_drawable): get the composite before we draw the drawable.
(gdk_drawable_real_get_composite_drawable): default
get_composite_drawable implementation that returns the drawable
itself
* gdk/gdkdrawable.h (struct _GdkDrawableClass ): Add
get_composite_drawable virtual function
* gdk/gdkwindow.c (gdk_window_begin_paint_region): Fix a cheesy
list-walking bug
* gdk/x11/gdkdrawable-x11.c (gdk_x11_draw_drawable): Add a hack to
make this work if the source drawable is a GdkDrawableImplX11
instead of a public drawable type. This is really broken; the
problem is that GdkDrawable needs a virtual method get_xid(), but
of course that doesn't work in practice. Enter RTTI.
Also, improve mismatched depth message.
* gdk/gdkpixmap.c (gdk_pixmap_get_image): Implement get_image for
GdkPixmap
* gdk/x11/gdkdrawable-x11.c (gdk_drawable_impl_x11_class_init):
install _gdk_x11_get_image as our implementation of get_image
* gdk/x11/gdkimage-x11.c (gdk_image_get): Rename to
_gdk_x11_get_image and export for use in gdkdrawable-x11.c
* gdk/gdkimage.c (gdk_image_get): Make this just a wrapper around
gdk_drawable_get_image
* gdk/gdkdraw.c (gdk_drawable_get_image): call virtual get_image
* gdk/gdkdrawable.h (struct _GdkDrawableClass ): Virtualize
get_image
* gtk/gtktreestore.c (gtk_tree_store_get_node): remove weird
trailing semicolon after for loop
155 lines
3.9 KiB
Makefile
155 lines
3.9 KiB
Makefile
## Process this file with automake to produce Makefile.in
|
|
|
|
# The name of the module.
|
|
DOC_MODULE=gtk
|
|
|
|
# The top-level SGML file.
|
|
DOC_MAIN_SGML_FILE=gtk-docs.sgml
|
|
|
|
# The directory containing the source code
|
|
DOC_SOURCE_DIR=$(top_srcdir)/gtk
|
|
|
|
# Extra options to supply to gtkdoc-fixref
|
|
FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
|
|
|
|
# Header files to ignore when scanning
|
|
IGNORE_HFILES= \
|
|
fnmatch.h \
|
|
gdk-pixbuf-loader.h \
|
|
gtkdebug.h \
|
|
gtkhsv.h \
|
|
gtkimcontextsimple.h \
|
|
gtkintl.h \
|
|
gtkprivate.h \
|
|
gtktextbtree.h \
|
|
gtktextchild.h \
|
|
gtktextdisplay.h \
|
|
gtktextiterprivate.h \
|
|
gtktextlayout.h \
|
|
gtktextmarkprivate.h \
|
|
gtktextsegment.h \
|
|
gtktexttagprivate.h \
|
|
gtktexttypes.h \
|
|
gtktypebuiltins.h
|
|
|
|
GTKDOC_CFLAGS = @STRIP_BEGIN@ \
|
|
@CFLAGS@ \
|
|
-I$(top_srcdir) \
|
|
-I$(top_builddir)/gdk \
|
|
-DGTK_DISABLE_COMPAT_H \
|
|
@GTK_DEBUG_FLAGS@ \
|
|
@GTK_XIM_FLAGS@ \
|
|
@GTK_LOCALE_FLAGS@ \
|
|
@PANGO_CFLAGS@ \
|
|
@GLIB_CFLAGS@ \
|
|
@more_cflags@ \
|
|
@STRIP_END@
|
|
|
|
GTKDOC_LIBS = @STRIP_BEGIN@ \
|
|
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la \
|
|
$(top_builddir)/gdk/@gdktargetlib@ \
|
|
$(top_builddir)/gtk/@gtktargetlib@ \
|
|
@more_ldflags@ \
|
|
@more_libs@ \
|
|
@GDK_WLIBS@ \
|
|
@PANGO_LIBS@ \
|
|
@GLIB_LIBS@ \
|
|
@GTK_LIBS_EXTRA@ \
|
|
-lm \
|
|
@STRIP_END@
|
|
|
|
GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
|
|
GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
|
|
|
|
content_files = \
|
|
objects_grouped.sgml \
|
|
text_widget.sgml
|
|
|
|
####################################
|
|
# Everything below here is generic #
|
|
####################################
|
|
|
|
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
|
|
|
|
EXTRA_DIST = \
|
|
$(DOC_MAIN_SGML_FILE) \
|
|
$(content_files) \
|
|
$(DOC_MODULE)-sections.txt \
|
|
$(DOC_MODULE)-overrides.txt
|
|
|
|
if ENABLE_GTK_DOC
|
|
all-local: html/index.html
|
|
|
|
$(DOC_MODULE)-decl.txt:
|
|
$(MAKE) scan
|
|
|
|
$(tmpl_sources): $(DOC_MODULE)-decl.txt $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
|
|
$(MAKE) templates
|
|
|
|
sgml/$(DOC_MODULE)-doc.bottom: $(tmpl_sources) $(DOC_MODULE)-decl.txt
|
|
$(MAKE) sgml
|
|
|
|
html/index.html: sgml/$(DOC_MODULE)-doc.bottom $(DOC_MAIN_SGML_FILE) $(content_files)
|
|
$(MAKE) html
|
|
endif
|
|
|
|
scan:
|
|
(cd $(srcdir) \
|
|
&& CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) \
|
|
&& gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(EXTRA_HFILES))
|
|
|
|
templates:
|
|
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
|
|
|
|
sgml:
|
|
cd $(srcdir) \
|
|
&& gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)
|
|
|
|
html:
|
|
test -d $(srcdir)/html || mkdir $(srcdir)/html
|
|
-cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
|
|
@echo '-- Fixing Crossreferences'
|
|
gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
|
|
|
|
clean-local:
|
|
rm -f *~ *.bak *.signals *-unused.txt
|
|
|
|
maintainer-clean-local: clean
|
|
cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
|
|
|
|
install-data-local:
|
|
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
|
|
(installfiles=`echo $(srcdir)/html/*.html`; \
|
|
if test "$$installfiles" = '$(srcdir)/html/*.html'; \
|
|
then echo '-- Nothing to install' ; \
|
|
else \
|
|
for i in $$installfiles; do \
|
|
echo '-- Installing '$$i ; \
|
|
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
|
|
done; \
|
|
echo '-- Installing $(srcdir)/html/index.sgml' ; \
|
|
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
|
|
fi)
|
|
|
|
#
|
|
# Require gtk-doc when making dist
|
|
#
|
|
if ENABLE_GTK_DOC
|
|
dist-check-gtkdoc:
|
|
else
|
|
dist-check-gtkdoc:
|
|
@echo "*** gtk-doc must be installed and enabled in order to make dist
|
|
@false
|
|
endif
|
|
|
|
dist-hook: dist-check-gtkdoc
|
|
mkdir $(distdir)/html
|
|
mkdir $(distdir)/sgml
|
|
mkdir $(distdir)/tmpl
|
|
-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
|
|
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
|
|
-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
|
|
-cp $(srcdir)/sgml/*.bottom $(srcdir)/sgml/*.top $(distdir)/sgml
|
|
|
|
.PHONY : html sgml templates scan
|