Get master's fixes for the file chooser

Signed-off-by: Federico Mena Quintero <federico@novell.com>

INSTALL.in

@@ -3,11 +3,19 @@ Prerequisites
 
 GTK+ requires the following packages:
 
- - The GLib, Pango, GdkPixbuf, ATK and cairo libraries, available at
-   the same location as GTK+. GTK+ @GTK_VERSION@ requires at least
-   GLib 2.23.6, Pango 1.20, GdkPixbuf 2.21.0 ATK 1.29.2 and cairo 1.6.0.
+ - The GLib, Pango, ATK and cairo libraries, available at the same 
+   location as GTK+. GTK+ @GTK_VERSION@ requires at least GLib 2.17.6,
+   Pango 1.20, ATK 1.13.0 and cairo 1.6.0.
 
- - gobject-introspection 0.6.7 or newer.
+ - The TIFF, PNG, and JPEG image loading libraries. You most
+   likely have these installed on your system already. If not
+   these libraries are available from:
+
+    http://www.libtiff.org/
+    http://www.libpng.org/
+    http://www.ijg.org/
+
+    libtiff must be version 3.6.0 or higher.
 
 Simple install procedure
 ========================

Makefile.am

@@ -1,10 +1,11 @@
 ## Makefile.am for GTK+
 include $(top_srcdir)/Makefile.decl
 
-SRC_SUBDIRS = gdk gtk modules demos tests perf
-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
+SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
 
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+# require automake 1.4
+AUTOMAKE_OPTIONS = 1.7
 
 EXTRA_DIST +=			\
 	HACKING			\
@@ -48,10 +49,14 @@ EXTRA_DIST +=			\
 	examples/buttons/info.xpm  \
 	examples/calendar/Makefile  \
 	examples/calendar/calendar.c  \
+	examples/clist/Makefile  \
+	examples/clist/clist.c  \
 	examples/entry/Makefile  \
 	examples/entry/entry.c  \
 	examples/eventbox/Makefile  \
 	examples/eventbox/eventbox.c  \
+	examples/filesel/Makefile  \
+	examples/filesel/filesel.c  \
 	examples/gtkdial/Makefile  \
 	examples/gtkdial/dial_test.c  \
 	examples/gtkdial/gtkdial.c  \
@@ -62,8 +67,11 @@ EXTRA_DIST +=			\
 	examples/helloworld2/helloworld2.c  \
 	examples/label/Makefile	\
 	examples/label/label.c	\
+	examples/list/Makefile  \
+	examples/list/list.c  \
 	examples/menu/Makefile  \
 	examples/menu/menu.c  \
+	examples/menu/itemfactory.c  \
 	examples/notebook/Makefile  \
 	examples/notebook/notebook.c  \
 	examples/packbox/Makefile  \
@@ -93,10 +101,14 @@ EXTRA_DIST +=			\
 	examples/statusbar/statusbar.c  \
 	examples/table/Makefile  \
 	examples/table/table.c  \
+	examples/text/Makefile  \
+	examples/text/text.c  \
 	examples/tictactoe/Makefile  \
 	examples/tictactoe/tictactoe.c  \
 	examples/tictactoe/tictactoe.h  \
 	examples/tictactoe/ttt_test.c  \
+	examples/tree/Makefile  \
+	examples/tree/tree.c  \
 	examples/wheelbarrow/Makefile  \
 	examples/wheelbarrow/wheelbarrow.c  \
 	examples/fixed/fixed.c  \
@@ -130,37 +142,37 @@ MAINTAINERCLEANFILES = \
 GDKTARGET=@gdktarget@
 
 ## Copy .pc files to target-specific names
-gtk+-$(GDKTARGET)-3.0.pc: gtk+-3.0.pc
-	rm -f gtk+-$(GDKTARGET)-3.0.pc && \
-	cp gtk+-3.0.pc gtk+-$(GDKTARGET)-3.0.pc
+gtk+-$(GDKTARGET)-2.0.pc: gtk+-2.0.pc
+	rm -f gtk+-$(GDKTARGET)-2.0.pc && \
+	cp gtk+-2.0.pc gtk+-$(GDKTARGET)-2.0.pc
 
-gdk-$(GDKTARGET)-3.0.pc: gdk-3.0.pc
-	rm -f gdk-$(GDKTARGET)-3.0.pc && \
-	cp gdk-3.0.pc gdk-$(GDKTARGET)-3.0.pc
+gdk-$(GDKTARGET)-2.0.pc: gdk-2.0.pc
+	rm -f gdk-$(GDKTARGET)-2.0.pc && \
+	cp gdk-2.0.pc gdk-$(GDKTARGET)-2.0.pc
 
-gtk+-$(GDKTARGET)-3.0-uninstalled.pc: gtk+-3.0-uninstalled.pc
-	rm -f gtk+-$(GDKTARGET)-3.0-uninstalled.pc && \
-	cp gtk+-3.0-uninstalled.pc gtk+-$(GDKTARGET)-3.0-uninstalled.pc
+gtk+-$(GDKTARGET)-2.0-uninstalled.pc: gtk+-2.0-uninstalled.pc
+	rm -f gtk+-$(GDKTARGET)-2.0-uninstalled.pc && \
+	cp gtk+-2.0-uninstalled.pc gtk+-$(GDKTARGET)-2.0-uninstalled.pc
 
-gdk-$(GDKTARGET)-3.0-uninstalled.pc: gdk-3.0-uninstalled.pc
-	rm -f gdk-$(GDKTARGET)-3.0-uninstalled.pc && \
-	cp gdk-3.0-uninstalled.pc gdk-$(GDKTARGET)-3.0-uninstalled.pc
+gdk-$(GDKTARGET)-2.0-uninstalled.pc: gdk-2.0-uninstalled.pc
+	rm -f gdk-$(GDKTARGET)-2.0-uninstalled.pc && \
+	cp gdk-2.0-uninstalled.pc gdk-$(GDKTARGET)-2.0-uninstalled.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gdk-$(GDKTARGET)-3.0.pc gtk+-$(GDKTARGET)-3.0.pc gail-3.0.pc
+pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-$(GDKTARGET)-2.0.pc gtk+-$(GDKTARGET)-2.0.pc gail.pc
 
 if OS_UNIX
-pkgconfig_DATA += gtk+-unix-print-3.0.pc
+pkgconfig_DATA += gtk+-unix-print-2.0.pc
 endif
 
 DISTCLEANFILES =				\
-	gtk+-unix-print-3.0.pc			\
-	gtk+-$(GDKTARGET)-3.0.pc		\
-	gdk-$(GDKTARGET)-3.0.pc			\
-	gail-3.0.pc				\
-	gtk+-$(GDKTARGET)-3.0-uninstalled.pc	\
-	gdk-$(GDKTARGET)-3.0-uninstalled.pc	\
-	gail-3.0-uninstalled.pc			\
+	gtk+-unix-print-2.0.pc			\
+	gtk+-$(GDKTARGET)-2.0.pc		\
+	gdk-$(GDKTARGET)-2.0.pc			\
+	gail.pc					\
+	gtk+-$(GDKTARGET)-2.0-uninstalled.pc	\
+	gdk-$(GDKTARGET)-2.0-uninstalled.pc	\
+	gail-uninstalled.pc 			\
 	config.lt
 
 distclean-local:
@@ -182,21 +194,21 @@ ChangeLog:
 	  echo A git checkout and git-log is required to generate this file >> $@); \
 	fi
 
-## copy the default target for this platform to gdk-3.0.pc and gtk+-3.0.pc
+## copy the default target for this platform to gdk-2.0.pc and gtk+-2.0.pc
 DEFAULT_GDKTARGET=x11
 install-data-hook:
 	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 test -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc && \
-	 test -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc && \
-	 rm -f gdk-3.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-3.0.pc gdk-3.0.pc && \
-	 rm -f gtk+-3.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-3.0.pc gtk+-3.0.pc) || \
+	 test -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc && \
+	 test -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc && \
+	 rm -f gdk-2.0.pc && cp -f gdk-$(DEFAULT_GDKTARGET)-2.0.pc gdk-2.0.pc && \
+	 rm -f gtk+-2.0.pc && cp -f gtk+-$(DEFAULT_GDKTARGET)-2.0.pc gtk+-2.0.pc) || \
 	(cd $(DESTDIR)$(pkgconfigdir) && \
-	 rm -f gdk-3.0.pc && cp -f gdk-$(GDKTARGET)-3.0.pc gdk-3.0.pc && \
-	 rm -f gtk+-3.0.pc && cp -f gtk+-$(GDKTARGET)-3.0.pc gtk+-3.0.pc)
+	 rm -f gdk-2.0.pc && cp -f gdk-$(GDKTARGET)-2.0.pc gdk-2.0.pc && \
+	 rm -f gtk+-2.0.pc && cp -f gtk+-$(GDKTARGET)-2.0.pc gtk+-2.0.pc)
 
 uninstall-local:
-	rm -f $(DESTDIR)$(pkgconfigdir)/gdk-3.0.pc
-	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc
+	rm -f $(DESTDIR)$(pkgconfigdir)/gdk-2.0.pc
+	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-2.0.pc
 
 dist-hook:
 	if test -f $(srcdir)/INSTALL.in && test -f $(srcdir)/README.in ; then \
@@ -230,11 +242,7 @@ sanity:
 snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
-DISTCHECK_CONFIGURE_FLAGS =		\
-		--enable-gtk-doc 	\
-		--enable-man 		\
-		--disable-rebuilds 	\
-		--enable-introspection
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --disable-rebuilds
 
 GITIGNOREFILES = \
 	po-properties/Makefile.in.in \

Makefile.decl

@@ -30,17 +30,13 @@ XVFB_START = \
 # call as: $(XVFB_START) && someprogram
 
 # test: run all tests in cwd and subdirs
-test: test-cwd test-recurse
-# test-cwd: run tests in cwd
-test-cwd: ${TEST_PROGS}
+test:	${TEST_PROGS}
 	@$(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
-	  $(XVFB_START) && { set -e; $(TESTS_ENVIRONMENT) ${GTESTER} --verbose ${TEST_PROGS}; }; \
+	  $(XVFB_START) && { set -e; ${GTESTER} --verbose ${TEST_PROGS}; }; \
 	}
-# test-recurse: run tests in subdirs
-test-recurse:
 	@ for subdir in $(SUBDIRS) ; do \
 	    test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) test ) || exit $? ; \
+	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
 	  done
 # test-report: run tests in subdirs and generate report
 # perf-report: run tests in subdirs with -m perf and generate report
@@ -81,6 +77,6 @@ test-report perf-report full-report:	${TEST_PROGS}
 	    rm -rf "$$GTESTER_LOGDIR"/ ; \
 	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
 	  }
-.PHONY: test test-cwd test-recurse test-report perf-report full-report
-# run make test-cwd as part of make check
-check-local: test-cwd
+.PHONY: test test-report perf-report full-report
+# run make test as part of make check
+check-local: test

NEWS

@@ -1,918 +1,3 @@
-Overview of Changes from GTK+ 2.90.5 to 2.90.6
-==============================================
-
-* All drawing done by GTK+ itself has been ported from
-  GDK drawing APIs to cairo
-
-* GtkExpander and GtkFrame now implement GtkSizeRequest
-
-* GtkExpander gained a ::label-fill property to make the label
-  fill the entire horizontal space
-
-* Allow windows to be dragged by clicking on empty
-  areas in menubars and toolbars
-
-* GtkAboutDialog can now refer to licenses using a ::license-type
-  enumeration instead of embedding the license text
-
-* Deprecations and cleanups:
- - Remove GtkNotebookPage
- - Remove public struct members in many classes
- - Remove the GtkRecentManager::limit property
- - Remove all GDK drawing functions, ie gdk_draw_*. Use cairo instead
- - Remove all GdkGC functions. Use cairo instead
- - Remove all of GdkImage. Use cairo instead
- - Remove all of GdkRGB. Use cairo instead
- - Remove gdk_{bit,pix}map_create_from_data
- - GDK no longer depends on the render X extension
-
-* New accessors:
- - gdk_cursor_get_cursor_type
- - gdk_device_get_n_axes
- - gdk_display_is_closed
- - gtk_notebook_get_tab_[hv]border
-
-* New cairo-related APIs:
- - gdk_window_create_similar_surface
- - gdk_window_get_background_pattern
-
-* Bugs fixed:
-  90935 GtkIMContextClass inheritance ...
-  97414 gtkaccellabel: s/seperator/separator/
- 336225 Support for common licenses in about dialog
- 554926 gtk_init_with_args: not setting translation domain...
- 557263 Notebooks return 1 selection even if they have no pages
- 579583 GtkStatusIcon's scroll-event documentation missing "Since: ..."
- 580291 Gail does not work with custom treemodels
- 596125 Property string fixes
- 604391 Gtk-CRITICAL when switching between tab
- 605190 Should delete the description of xim related options...
- 609264 gtk_(tree/list)_store_set documentation unclear about ownership
- 611313 Window dragging from menubars/toolbars
- 612919 crash in System Monitor: I was moving up-down wit...
- 614049 Allow packing options for GtkExpander label widgets
- 614443 Doxygen 'forgets' #define documentation under certain conditions
- 615474 gtk_widget_set_has_window() documentation is not correct
- 618327 GtkNotebookPage should be deprecated
- 621571 Fix damage events on offscreen windows
- 622658 GTK_STOCK_FILE Stock Label
- 623603 meld built with pygtk-2.16.0 giving warnings
- 623865 gtkdnd: pointer grab may never finish (ungrab before grab)
- 624087 Missing accessor for GdkCursor.type
- 624224 Missing accessor for GdkDisplay.closed
- 624270 crash in gtk_entry_completion_default_completion_func
- 624333 Deprecate GtkRecentManager:limit
- 624362 access an invalid ActionGroup
- 624367 GtkButtonBox is broken
- 624397 Move GtkBoxChild from public .h to gtkbox.c
- 624432 GtkRadioMenuItem is broken
- 624540 GtkRadionAction loop in its activate handler
- 624687 switch-page bug when activated from menu
- 624707 warnings when showing gnome-terminal menus on gtk master
- 624779 GtkCalendar padding/margin/spacing/border/whatever is hard-coded
- 625104 Don't try and use the child of a GtkSeparatorMenuItem
- 625235 Tooltips cause warnings
- 625300 Buttons order in dialogs broken in gtk+3
- 625416 gtk_file_chooser_default_map should not reload directory
- 625650 Add annotations to gtk_tree_model_iter_next() and...
- 625655 win32 compile failure due to G_SEAL
- 625715 comment string in GtkAboutDialog is not centered
- 625953 GailAdjustment does not implement get_minimum_increment...
- 626052 Activating a file in GtkFileChooserDialog activates action...
- 626276 gtk_tree_selection_set_select_function() should allow...
- 626514 License dialog doesn't take into account long copyrights
-
-* Translation updates:
- Asturian
- Galician
- German
- Hebrew
- Indonesian
- Norwegian bokmål
- Punjabi
- Romanian
- Simplified Chinese
- Slovenian
- Spanish
- Swedish
- Traditional Chinese
-
-
-Overview of Changes from GTK+ 2.90.4 to 2.90.5
-==============================================
-
-* Support NOCONFIGURE in autogen.sh to avoid running configure
-
-* The cairo dependency has been bumped to 1.9.10
-
-* Drop aliasing hacks instead use -Bsymbolic-funtions.
-
-* Bugs:
- 589904 Certain drawing in some widgets does not pass on...
- 610346 Confusion between GtkWindow:allow-grow and GtkWindow:resizable
- 613284 Replace GdkRegion with cairo_region_t
- 617386 Migrate API docs from templates to source files (GtkButton)
- 617389 Migrate API docs from templates to source files (GtkCalendar)
- 617392 Migrate API docs from templates to source files (GtkCellEditable)
- 621414 Can't select file on file browser popup after choosing to sort...
- 622677 Remove GdkWindowObject public structure
- 623239 also show num-lock warning
- 623307 Annotate gdk_display_manager_list_displays return value
- 623389 [iconview] Fix segfault when using rubberband selection
- 623476 [windows] gdk fails to compile
- 623520 gtk+ 3 fails to build from outside git source tree
- 623845 Use -Bsymbolic
- 461618 use GSlice for gtkrequisition
-
-* Deprecations and cleanups:
- - GdkRegion has been removed, and region-using code has been ported
-   to cairo_region_t and cairo_rectangle_int_t.
- - The deprecated GdkFont has been removed, together with vestigial
-   uses in GTK+, including the GdkFontSel::font property and a GdkFont
-   member in GtkStyle.
- - The GdkWindowObject structure has been removed from public headers.
- - The GdkWindow::allow-grow and ::allow-shrink properties have been removed.
-
-* Quartz:
- - Misc fixed to clipping and color handling
- - Update the DND code for GdkDevice changes
-
-* Translation updates:
- Breton
- Czech
- Estonian
- Galician
- Hebrew
- Kazakh
- Norwegian bokmål
- Slovenian
- Simplified Chinese
- Spanish
-
-
-Overview of Changes from GTK+ 2.90.3 to 2.90.4
-==============================================
-
-* GSEAL is now enabled by default
-
-* gdk-pixbuf has been moved into a separate module
-
-* The GtkExtendedLayout interface has been renamed to
-  GtkSizeRequest
-
-* gtk_init warns if it detects GTK2.x and GTK3 being used
-  in the same process
-
-* Misc new API:
- gtk_accessible_set_widget
- gtk_message_dialog_get_message_area
- gtk_font_selection_dialog_get_font_selection
- gtk_window_group_get_current_grab
- gtk_table_get_size
- gtk_button_get_event_window
- gdk_device_manager_get_client_pointer
- gdk_image_get_pixels
-
-* Bugs fixed:
- 522756 gnome-appearance-properties crashed with SIGSEGV...
- 620832 make _gtk_window_group_get_current_grab() public
- 621250 Missing accessors for GtkRange has_stepper_X
- 621685 Add gdk_device_manager_get_client_pointer() ...
- 621690 Enable per-device events on gtk_widget_realize()
- 621927 Bug in gtk/Makefile.in: affects gtktypefuncs.c
- 622011 Don't handle "connecting-to-device" state reason
- 622581 [GSEAL] GtkButton has no accessor for event_window
- 622765 Duplicate symbols in Gdk on OSX
- 622827 test/testapplication.c doesn't build in quartz
-
-* Translation updates:
- Arabic
- Armenian
- Galician
- Slovenian
- Spanish
-
-
-Overview of Changes from GTK+ 2.90.2 to 2.90.3
-==============================================
-
-* GtkProgress has been removed. It was entirely deprecated for
-  a long time
-
-* GtkApplication has been updated to match the GApplication API
-  as of GLib 2.25.9
-
-* XI2:
- - Device grabs now take precedence over GTK+ grabs
- - Various other bug fixes
-
-* Extended Layout:
- - Prevent negative allocations (as seen in emacs and gedit)
-
-* Win32: XP theming is back !
-
-* Misc new API:
- - Add an accessor for GtkViewport->view_window
- - Add an accessor for GdkDragContext->source_window
- - gtk_icon_theme_load_symbolic_for_style a variant of
-   gtk_icon_theme_load_symbolic taking a GtkStyle
-
-* Introspection:
- - Misc annotation fixes
-
-* Cleanups:
- - GTK_OBJECT_FLAGS and GtkObjectFlags have been depreated
-
-* Bugs fixed:
- 620618 get rid of GtkProgress
- 615666 GTK_OBJECT_FLAGS() should be deprecated
- 617444 GNU emacs warnings with extended layout GTK+
- 621631 Non-consistent style in GtkUIManager docs
- 621136 GtkCalendar: Some functions always return TRUE
- 621003 GtkApplication] Update for GApplication API changes
- 621683 gtk_menu_attach_to_widget() should emit an "attach-widget"...
- 621479 typo in GTK docs on library.gnome.org
- 621081 GtkViewport missing accessor for view_window.
- 620440 Combo-boxes loose focus
- 621775 Space symbol missed in Resources chapter
- 621578 Symbolic color cut-and-paste mess
- 621111 gtk_init_with_args()'s GOptionEntry argument should be const
- 602289 gdk_spawn_on_screen(_with_pipes) uses gint for pid
-
-* Updated translations:
- Galician
- Norwegian bokmål
- Spanish
-
-
-Overview of Changes from GTK+ 2.90.1 to 2.90.2
-==============================================
-
-* GtkApplication: an application class, based on GApplication. Currently,
-  this is fairly minimal, but it is good enough already to replace libunique.
-  Future work:
-  - Add a way to say "This is my application menubar", which gets
-    put into all toplevel windows on non-OS-X, and into the top
-    on OS X
-  - Support session management
-  - Maybe support application settings
-
-* Misc new api:
- - gtk_window_has_group: determines if a window is part of a window group
- - gtk_status_bar_remove_all: removes all messages from a statusbar
-
-* DND on offscreen windows works now
-
-* GtkIconView:
- - arrow keynav can now be connected over adjacent icon views
-
-* GtkAssistant:
- - gtk_assistant_commits: prevents going back beyond a certain
-   point in the page sequence, adjust shown buttons appropriately
- - It is now officially supported to have a progress page at the
-   end of the page sequence
-
-* Introspection:
- - Many annotation fixes
- - gdkx.h api is exported in a separate typelib, GdkX11-3.0
-
-* Cleanups:
- - the draw_string function has been removed from GtkStyle
- - gdk_get/set_use_xshm have been removed
- - Deprecated gdk_color api has been removed
-
-* Documentation related to GTK+ 1.2, etc has been removed. Instead
-  there is an initial GTK+ 3 porting guide now.
-
-* Bugs fixed:
- 620509 Progress bar rendering is broken
- 607628 DnD operation doesn't work when using offscreen.
- 619838 kill off references to gtk 1.2 in docs/comments
- 608218 GtkOffscreenWindow causes bad window with GtkEntry
- 619649 Remove deprecated code from GdkColor
- 619080 text-inserted events should not be emitted unless text...
- 620511 Use g_source_set_name for all custom GSources in GTK+
- 603637 gtk printer dialog does not show remote printer
- 618271 Add gtk_window_has_group()
- 617863 Actually expose the X11 funcs through introspection
- 620244 misprint in the description of the function gtk_widget_list_...
- 549127 Print error dialog not shown
- 611709 gseal hides GtkStatusBar->messages but doesn't give anything...
- 596428 GtkAssistant: Support ending with a progress page
-
-* Translation updates:
-Esperanto
-Hebrew
-Irish
-
-
-Overview of Changes from GTK+ 2.90.0 to 2.90.1
-==============================================
-
-* Printing: The list of locales using US Letter papersize has
-  been updated to match the CLDR 1.8.1
-
-* The default location for the 'module cache' files (ie the files
-  produced by gdk-pixbuf-query-loaders and gtk-query-immodules) has
-  been changed to $libdir/gtk-3.0/3.0.0/{loaders,immodules}.cache.
-  This should avoid multilib problems with the previous location.
-
-  Additionally, the query utilities accept an --update-cache argument
-  to update the cache file directly, instead of writing to stdout
-
-* gtk_radio_action_join_group: A binding-friendly way to manage
-  radio actions.
-
-* GtkAdjustment enforces values to the range [lower, upper - page_size]
-
-* GDK has been GSEALed, with the addition of suitable accessors
-
-* The XI2 branch with better support for multiple input devices has
-  been merged, together with backends for XInput, XInput2, win32 and
-  Quartz, and corresponding updates to input-device handling code
-  in GTK.
-
-* A number of orientable widgets are no longer abstract: GtkBox,
-  GtkButtonBox, GtkPaned, GtkRuler, GtkScale, GtkScrollbar, GtkSeparator.
-  All of these can now be instantiated and flipped between horizontal
-  and vertical orientation at runtime. Their H/V subclasses are still
-  available, as convenience API.
-
-* More deprecated API has been removed
-
-* Bugs fixes:
- 613132 GtkBoxChild should probably be deprecated
- 592580 GDK needs sealing
- 618870 GTK+ uses wrong pkg-config to reveal the CAIRO_PREFIX
- 616817 Remove code to support deprecated GtkToolbar api
- 619114 undefined reference to `XkbBell'
- 617863 Actually expose the X11 funcs through introspection
- 613302 GtkWidget not emitting the unmap signal
- 565559 Incorrect leave-notify signals for treeview
- 533946 GtkHScale does not update correctly
- 618000 Sync paper size fallbacks with CLDR 1.8.1
- 614581 Gtk print dialog freezes on start up
- 551322 configure does not use -lm in jasper (JPEG2000) testing
- 619474 Fixes for GtkAdjustment for GTK+ 3
- 555087 Shouldn't the return type of gtk_entry_completion_get_model...
- 619385 Fix compilation warning: Do not break strict-aliasing rules
- 596725 Add XInput2 support
-
-* Updated translations
- Arabic
- Estonian
- Galician
- Italian
- Indonesian
- Oriya
- Shavian
-
-
-Overview of Changes from GTK+ 2.20.x to 2.90.0
-==============================================
-
-* GtkExtendedLayout: Width-for-height geometry management.
-  This change is known to currently cause minor problems in
-  some applications, see
-  617444 GNU emacs warnings with extended layout GTK+
-  617556 inkscape toolbars broken with extended layout
-
-* gtk_icon_theme_load_symbolic: Support for 'symbolic' icons
-
-* Applications can indicate their preference for a dark theme
-  variant by setting GtkSettings::gtk-application-prefer-dark-theme
-
-* GtkTreeModelFilter can be more usefully subclassed
-
-* Tooltip positioning has been changed to make it less likely
-  that the tooltip covers up the widget that it relates to
-
-* Deprecated functions have been removed (though some more work
-  remains to be done in GDK)
-
-* This release is parallel installable with GTK+ <= 2.22, by renaming
-  .pc files, libraries, include paths, module paths, gtkrc files, etc
-  to include a '3.0' in its name.
-
-* Updated translations:
- Basque
- Bengali
- Bengali India
- Catalan
- Catalan (Valencian)
- Crimean Tatar
- Danish
- Dutch
- Galician
- Greek
- Indonesian
- Kannada
- Kazakh
- Latvian
- Marathi
- Norwegian bokmål
- Spanish
- Thai
- Ukrainian
-
-
-Overview of Changes from GTK+ 2.19.7 to 2.20.0
-==============================================
-
-* Support the tracker 0.8 api in the file chooser search code
-
-* Bug fixes:
- 609929 Dragging between two windows cause the menu widget...
- 613241 entry sends extra notify::text with "" on destroy
- 610946 error during gtk+ build + nonsense error messages
- 610176 Some cups1.2 feature use not shielded by API version-check
- 612574 GtkMenuItem does not emit notify::label when label...
- 612505 Entry layout not updated when underlying buffer changes
- 612346 gdk_window_set_icon_name doesn't work
- 612308 GTK+ Build error: redefinition of 'struct IPrintDialogCallback'
- 611118 Set APPLICATION_ID when launching desktop app
- 612768 DND cause crash in VNC environment
- 612575 Improve docs of gtk_notebook_set_tab_label_packing
- 605333 Confusing error in documentation
- 613028 Do not get a GtkSettings for size lookup if...
-
-* Translation updates:
- Basque
- Brazilian Portuguese
- Catalan
- Dutch
- Estonian
- Finnish
- Galician
- Gujarati
- Italian
- Punjabi
- Romanian
- Spanish
- Swedish
- Traditional Chinese
- Vietnamese
-
-
-Overview of Changes from GTK+ 2.19.6 to 2.19.7
-==============================================
-
-* Bug fixes:
- 611707 Move documentation from templates to inline comments
-  69872 GTK_WIDGET_SET_FLAGS should be deprecated
- 612066 empathy hangs when clicked on information about contact...
- 557420 Some compose sequences don't work anymore...
- 569042 gailbooleancell does not seem to attend to changes...
- 600992 File chooser reference counting issues
- 610905 gtk_drag_source_set need instrospection hint
- 611051 Search Entry Clear Icon not accessible
- 611217 Incorrect translator comment
- 611317 Document targets in drag and drop
- 611319 gtk_window_set_transient_for undocumented NULL value for parent
- 611658 Update documentation for gtkvscrollbar
- 611662 Update documentation for gtkvseparator
- 611686 focus_in/focus_out in gailtreeview.c should return FALSE...
- 611831 Move documentation to inline comments: GtkVBox
- 612119 Do not scroll when middle pasting
-
-* Translation updates:
- Afrikaans
- Arabic
- Basque
- British English
- Bulgarian
- Czech
- Danish
- French
- Galician
- German
- Greek
- Hungarian
- Lithuanian
- Low German
- Norwegian bokmål
- Polish
- Portuguese
- Russian
- Slovenian
- Swedish
-
-
-Overview of Changes from GTK+ 2.19.5 to 2.19.6
-==============================================
-
-* Bugs fixed:
- 610701 gnome-shell crashes frequently
- 604799 Crash when button is pressed.
- 609744 crash at parse_data_for_row_pseudocolor
- 600789 gdk/gdkwindow.c "find_native_sibling_above" will crash
- 610141 gtk_assistant_get_nth_page() function fails to deliver...
- 609952 destroying a notebook window when the last tab got dragged...
- 603923 [annotations] gtk_tree_store_newv/set_column_types
- 610474 [annotations] Add allow-none
- 609650 GtkPlug Embedded signal is not emitted when plug...
- 610381 More space between toolbar icon and label
- 548026 No accessor for GtkWidget.requisition
- 609514 fix introspection comments for gtk_tree_view_get_path_at_pos
- 610235 msgid in bad English
- 607697 GDK_META_MASK always set on Alt-Enter with gtk+ 2.19.x
- 610632 gtk_info_bar_set_default_response problem
- 609172 gdk/directfb: little cleanups
- 610184 gtk_assistant_set_current_page() segfaults...
-
-* Updated translations
- Bulgarian
- Czech
- Estonian
- German
- Japanese
- Korean
- Lithuanian
- Norwegian bokmål
- Oriya
- Polish
- Romanian
- Slovenian
- Spanish
-
-
-Overview of Changes from GTK+ 2.19.4 to 2.19.5
-==============================================
-
-* GSEAL work:
- - Add accessors for GtkPaned members
- - Add gtk_widget_style_attach
- - Seal GtkTextTag
- - Deprecate GtkCurveType
- - More GtkWidget flags accessors
-
-* Bugs fixed:
- 403485 Move docs from tmpl/* to the source files
- 556263 Deprecate GtkCurve
- 554420 Seal GtkTextTag
- 561816 Optimize gtk_paned_set_position notifications
- 606288 Not using GtkOptionMenu deprecated symbols in test file
- 607061 GtkPlug socket window is sometimes incorrectly unref'd
- 607344 GtkCalendar: crash when using tooltips via glade
- 607885 GtkPaned::handle lack accessor
- 608162 gtktoolbutton doesn't create right proxy menu item...
- 608345 wrong reference on gdk_keymap_translate_keyboard_state
- 608370 dnd drag-dest signal handlers don't get correctly disconn...
- 608410 GOK types backwards in text entry fields
- 608615 DnD events sent to wrong window
- 608807 Marks on GtkScale widgets can overlap
- 609188 gdk/directfb: compiler warning in _gdk_windowing_pointer_grab()
- 609191 gdk/directfb: use G_DEFINE_TYPE in gdkcolor-directfb
- 609199 gdk/directfb: use G_DEFINE_TYPE in gdkgc-directfb
- 609201 gdk/directfb: max cursor size is artificially limited
- 591186 GTK Menu Bar is unreadable under Windows 7
-
-* Updated translations
- Bengali
- Brazilian Portuguese
- Czech
- Estonian
- French
- Norwegian bokmål
- Slovak
- Spanish
- Thai
-
-
-Overview of Changes from GTK+ 2.19.3 to 2.19.4
-==============================================
-
-* GSeal:
- - New accessors for GtkEntry windows
- - New accessors for GtkRange members
-
-* Bugs fixed:
- 607082 Add accessors for sealed GtkRange members
- 567729 Add GtkToolPalette
- 591102 gdk_pixbuf_save() creates a zero-size file...
- 600865 gnome-panel crashed with "BadPixmap...
- 601412 action area presence makes gnome-terminal window grow...
- 603144 Suspected wrong builtin page size: Chinese PRC6 and...
- 606009 weirdness with clipping in abiword - csw
- 606698 Misplaced declaration of gtk_print_job_set_status
- 606761 pixops.c: variables are declared at middle of block
- 607217 Mixing calls to _set_markup and _set_text causes...
- 607269 gtk_label_set_attributes with empty list no longer...
- 607322 Double-click doesn't work if the item is selected...
- 607687 f-spot crashes when using themes using the pixmap...
- 607778 Add accessors for GtkEntry's windows
- 607770 Leak in GtkTreeView with HildonPannableArea
- 603245 drawing artifacts with action widgets and long tab...
-
-* Updated translations:
- Arabic
- Asturian
- Basque
- Bengali
- Bulgarian
- Burmese
- Norwegian bokmål
- Slovenian
- Spanish
- Swedish
-
-
-Overview of Changes from GTK+ 2.19.2 to 2.19.3
-==============================================
-
-* GSeal:
- - Deprecate widget flag macros
-   GTK_WIDGET_STATE
-   GTK_WIDGET_SAVED_STATE
-   GTK_WIDGET_FLAGS
-   GTK_WIDGET_TOPLEVEL
-   GTK_WIDGET_NO_WINDOW
-   GTK_WIDGET_COMPOSITE_CHILD
-   GTK_WIDGET_APP_PAINTABLE
-   GTK_WIDGET_CAN_DEFAULT
-   GTK_WIDGET_CAN_FOCUS
-   GTK_WIDGET_DOUBLE_BUFFERED
-   GTK_WIDGET_HAS_DEFAULT
-   GTK_WIDGET_HAS_GRAB
-   GTK_WIDGET_RECEIVES_DEFAULT
- - Also deprecate the type macros
-   GTK_WIDGET_TYPE
-   GTK_OBJECT_TYPE_NAME
-   GTK_OBJECT_TYPE
-
-* GtkOffscreenWindow: A new toplevel container widget to manage
-  offscreen rendering of child widgets
-
-* OS X:
- - Memory leak fixes and other improvements
-
-* Bugs:
- 604901 Provide generic offscreen rendering container
- 597100 There is a misprint in the documentation...
- 598383 GtkWidget::state-changed signal should be documented
- 602284 Need a way to retrieve the preedit string in a GtkTextView
- 605090 Fix some compilation warnings
- 605199 Contradiction in the description of function...
- 606068 Setup libjpeg error handling earlier...
- 606230 gtk_combo_box_set_active_iter & unsetting the active item
- 606291 Fix some issues in "Migrating from GtkOptionMenu...
- 606434 prop-editor should support GdkColor
-
-* Translations:
- Asturian
- Basque
- Kannada
- Norwegian bokmål
- Slovenian
- Spanish
- Swedish
- Thai
- Ukrainian
-
-
-Overview of Changes from GTK+ 2.19.1 to 2.19.2
-==============================================
-
-* Introspection:
- - Introspection data for gdk-pixbuf, gdk and gtk is now
-   included in GTK+ itself. As a consequence, the atk dependency
-   has been bumped to 2.29.2, and a gobject-introspection dependency
-   has been added. configure with --disable-introspection in order
-   to not build introspection data.
-
-* Client-side windows:
- - Fix some issues with handling of button and motion events
- - Fix damage reporting for drawing on offscreen windows
- - Fix problems with handling of input extension events
-
-* Printing:
- - Add api to handle printer hard margins
-
-* Simple IM Context:
- - Sync with Xorg compose file
- - Make Compose-vowel-minus combinations consistent
-
-* GDK:
- - gdk_screen_get_primary_monitor: New function to get the
-   'primary' monitor in a multi-monitor setup
-
-* gdk-pixbuf has gained the ability to store and retrieve embedded
-  ICC color profiles in png and tiff images
-
-* Keyboard handling:
- - Mnemonic underlines can now optionally be hidden until the Alt key
-   is pressed, this can be turned on with the gtk-auto-mnemonics setting
- - Using the Super, Meta and Hyper modifiers in accelerators is working
-   more reliably
-
-* Bugs fixed:
- 603652 Sporadic crashes with GtkSocket
- 605008 the region of damage event doesn't be copied in gdk_event_copy
- 588554 only show the accelerator when pressing alt
- 601473 GDK_BUTTON?_MOTION_MASK appears to be broken
- 601712 Add API for determining primary monitor
-  50942 selection/arrow key improvement
- 427409 editing shortcut always fails with super key
- 468989 need a way to get the printer's hard margins
- 502266 gtk_tree_selection_get_selected_rows free example produces...
- 592279 Introspection support
- 597386 Cannot click buttons more than once without moving the mouse...
- 599213 Use GtkCellEditable:editing_canceled property instead...
- 599397 Button stuck at pressed look after screen rotation
- 601383 gtk_icon_view_get_selected_items: example code gives...
- 602099 Actions can be activatable too
- 603619 the colormap of offscreen's pixmap doesn't inherit...
- 603904 gdk_draw_line doesn't have expose area.
- 604117 Add info about single includes when compiling GTK+ apps
- 604289 Please permit progress pages to be final in a dialog
- 604462 gtktoolitem.c: return-value is different type
- 604747 Using gdk_draw_line, the expose area of damage event is wrong
- 604787 property-notify-event is not delivered to a non-toplevel...
- 604881 GtkCellEditable::editing-cancelled should be writable
- 591085 GtkBuilder object ID bounded to GtkWidget "name" property
-
-* Updated translations:
- Arabic
- Estonian
- Hebrew
- Low German
- Norwegian bokmål
- Slovenian
- Spanish
- Telugu
- Vietnamese
-
-
-Overview of Changes from GTK+ 2.19.0 to 2.19.1
-==============================================
-
-* Client-side windows:
- - Avoid some unnecessary exposes
- - Avoid unnecessary redraws related to clearing windows
-
-* GtkNotebook gained an 'action area'
-
-* GtkStatusbar gained a 'message area'
-
-* GtkToolPalette is a new container to show tool items
-  in collapsible groups in a grid
-
-* gdk-pixbuf can now handle compressed TIFF images
-
-* GSEAL work:
- - New accessor: gtk_window_get_window_type()
-
-* Bugs fixed:
- 590017  Does not compile under MinGW32 + Wine
- 569430 Gail should include a reciprocal relationship for NODE_CHILD_OF
- 598758 Need context for a propper translation
- 594535 No accesor for GtkStatusbar->label and ->frame
- 602725 fix setting icon-size on GICON images
- 599402 Landscape and Reverse Landscape icons need to be swapped
- 588740 JPEG images open with blur effect?
- 601337 Only use gdk_input_select_events() if XINPUT_NONE is defined
- 598050 Flickering in a gtk_socket
- 600158 Do not use static GTypeInfo and GInterfaceInfo
- 561973 Problem dragging images from Firefox to GTK+ app on Windows
- 601512 Remove unnecessary check in GtkTreeModelFilter
- 600222 Check for existence of cairo-svg.h in configure.in
- 595498 No accesor for GTK_WINDOW ()->type
- 116650 "action area" for GtkNotebook (e.g. for tab close button)
- 600150 GtkColorSelection tooltip issues
- 480065 wrong tree collapsed (or expanded) after having scrolled
- 596473 Second double-click of GtkTreeView row doesn't emit...
- 601869 GtkUIManager assumes too much about popup menus
- 581145 Wrong positioning for fullscreen gedit toolbar animation
- 602724 gailimage doesn't handle GTK_IMAGE_{GICON,ICON_NAME}...
- 561130 get_monitor_geometry segfaults if called with non-existant...
- 597026 Missing include for memset()
- 585383 Segfault in gdk_pixbuf__ico_image_save
- 597865 Move documentation from templates to inline comments
- 123569 Catch contents being reparented out of socket
- 561334 Incorrect named constant in documentation of two GtkButton...
- 601611 gtk_selection_data_get_targets() reads X Atom data as GdkAtoms
- 601409 action area presence modifies notebook behaviour
- 603268 wrong Since: markers in toolpalette merge
- 603271 wrong toolbar style
- 601959 must release compose key before continuing compose sequence
- 603302 Incorrectly warn about links on text with color and underline
- 603201 gtk_about_dialog_set_url_hook has no effect anymore
- 591438 dfb_events_dispatch is not thread safe
- 589842 GtkAction API to have its menu item proxies have always-show...
- 584700 TIFF pixbuf loader should support compression
- 603128 Adding new UI that was recently removed may cause wrong order
- 601682 Print preview should use gtk_show_uri by default
- 596083 Deprecate notebook label packing functionality
-
-* Updated translations:
- Estonian
- Galician
- Japanese
- Low German
- Norwegian bokmål
- Punjabi
- Slovenian
- Spanish
- Swedish
-
-
-Overview of Changes from GTK+ 2.18.x to 2.19.0
-==============================================
-
-* A throbber widget and cell renderer have been added: GtkSpinner and
-  GtkCellRendererSpinner
-
-* GtkFileSystemModel has been reimplemented, for major speedups and
-  other improvements
-
-* Synchronize compose sequences with the current X.org Compose file
-
-* Win32:
- - The GDI+ image loader works again
- - XP themes have been disabled since they don't work currently
-
-* OS X:
- - Fix crashes due to unimplemented GdkWindowImplIface methods
- - Use standard Mac keyboard shortcuts (Cmx-X, Cmd-C instead of
-   Ctrl-X, Ctrl-C, etc)
- - Add a pixbuf loader for the QTIF format
- - Improve multi-monitor handling
-
-* GSEAL work:
- - New accessor for GtkDialog buttons: gtk_dialog_get_widget_for_response
- - New accessor for GtkViewport bin_window: gtk_viewport_get_bin_window
- - Add a GtkCellEditable::editing-canceled property
-
-* Deprecations:
- - GtkInputDialog has been deprecated
- - GtkCurve and GtkGammaCurve have been deprecated
- - The tab-packing feature in GtkNotebook has been deprecated
-
-* Bugs fixed:
- 594644 Cannot compile GTK+ with MinGW 4.4.0
- 581150 GtkIconView tries to paint items with invalid sizes
- 598881 Unimplemented GdkWindowImplIface methods crash gimp on OSX
- 598218 Substitute deprecated gtk_*_ref/unref calls
- 381371 Print margins not correct in WIN32 - not allowing for...
- 597596 Toolbar button accessible objects don't have label name
- 599118 Translators comment for "Finishing" labels
- 598261 Add support to GtkTooltip to handle GIcons
- 530351 Use standard mac shortcuts
- 597865 Move documentation from templates to inline comments
- 596083 Deprecate notebook label packing functionality
- 594903 Deprecate GtkInputDialog
- 599403 Avoid using accel group internals in GtkSocket
- 590800 The window content is not updated correctly when scrolling
- 598515 Do not assign the GtkSpinner parent class twice
- 552678 gdi+ pixbuf loaders fail on "large" images
- 598217 Substitute deprecated gdk_*_ref/unref calls
- 596238 Make Quartz backend properly implement the GdkScreen...
- 599446 atk_object_set_name () assertion in gtk_tool_button_set_label
- 592582 Print preview doesn't reflect the printout
- 563010 GtkFileChooserButton cannot have none file selected again
- 596019 No accesors for GtkDialog buttons
- 366217 Add QTIF image support
- 594962 No accessor for GTK_ENTRY (entry)->editing_canceled
-
-* Updated translations:
- Arabic
- Brazilian Portuguese
- Bulgarian
- Catalan
- Finnish
- Greek
- Norwegian bokmål
- Oriya
- Punjabi
- Romanian
- Russian
- Serbian
- Shavian
- Slovenian
- Spanish
- Swedish
- Slovenian
- Vietnamese
-
-
-Overview of Changes from GTK+ 2.18.1 to 2.18.2
-==============================================
-
-* GTK+ now ignores SIGPIPE in gtk_init(). Previously
-  this was done deep in the lpr printbackend.
-
-* Fix compilation of the DirectFB backend.
-
-* Bugs fixed:
- 597386 Cannot click buttons more than once...
- 588059 sometimes notification icons are not visible with csw
-
-* Updated translations:
- Italian
- Japanese
- Serbian
-
-
 Overview of Changes from GTK+ 2.18.0 to 2.18.1
 ==============================================
 

README.in

@@ -27,25 +27,6 @@ Installation
 See the file 'INSTALL'
 
 
-Release notes for 2.20
-======================
-
-* GtkStatusbar now has a message area (see gtk_status_bar_get_message_area)
-  which makes it easy to place additional widgets inside the statusbar
-  frame or to replace the label widgets. Previously, this was only possible
-  by accessing the innards of the statusbar widget directly. Applications
-  which are doing so may need some adjustments, since the addition of the
-  message area changed the internal widget hierarchy.
-
-* GtkBuilder no longer sets the "name" property of widgets to the ID
-  attribute of the <object>. Use gtk_buildable_get_name() instead of
-  gtk_widget_get_name() to obtain the ID.
-
-* GTK+ now includes introspection data, as a consequence, it gained a
-  dependency on gobject-introspection. It is possible to build without
-  introspection by passing --disable-introspection to configure.
-
-
 Release notes for 2.18
 ======================
 
@@ -111,11 +92,15 @@ Release notes for 2.14
   to GTK_SENSITIVITY_ON, so that the button is always sensitive or
   GTK_SENSITIVITY_OFF to make it insensitive respectively.
 
-* GtkAdjustment now enforces that values are restricted to the
-  range [lower, upper - page_size]. This has always been the documented
-  behaviour, and the recommended practice is to set page_size to 0
-  when using adjustments for simple scalar values, like in a slider
-  or spin button.
+* In the early 2.14.x releases, GtkAdjustment was changed to enforce
+  that values are restricted to the range [lower, upper - page_size].
+  This has always been the documented behaviour, and the recommended
+  practice is to set page_size to 0 when using adjustments for simple
+  scalar values, like in a slider or spin button.
+  Due to the large number of applications that are affected by this
+  change, the behaviour has been reverted to the old behaviour in
+  2.14.3, with an explicit warning that this change will be
+  reintroduced in 2.90.
 
 * gdk-pixbuf will use GIO for mime type detection if possible. For
   this to work, shared-mime-info needs to be installed and XDG_DATA_DIRS

autogen.sh

@@ -19,14 +19,14 @@ if libtoolize --version < /dev/null > /dev/null 2>&1 ; then
 			 sed -e 's/^\(.*\)([^)]*)\(.*\)$/\1\2/g' \
 			     -e 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
 	case $libtool_version in
-	    2.2*)
+	    1.4*|1.5*|2.2*)
 		have_libtool=true
 		;;
 	esac
 fi
 if $have_libtool ; then : ; else
 	echo
-	echo "You must have libtool 2.2 installed to compile $PROJECT."
+	echo "You must have libtool 1.4 installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
 	echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/"
 	DIE=1
@@ -54,14 +54,18 @@ if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
 else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
     AUTOMAKE=automake-1.10
     ACLOCAL=aclocal-1.10
+else if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
+    AUTOMAKE=automake-1.7
+    ACLOCAL=aclocal-1.7
 else
 	echo
-	echo "You must have automake 1,10.x or 1.11.x installed to compile $PROJECT."
+	echo "You must have automake 1.7.x, 1,10.x or 1.11.x installed to compile $PROJECT."
 	echo "Install the appropriate package for your distribution,"
 	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
 	DIE=1
 fi
 fi
+fi
 
 if test "$DIE" -eq 1; then
 	exit 1
@@ -72,12 +76,7 @@ test $TEST_TYPE $FILE || {
 	exit 1
 }
 
-# NOCONFIGURE is used by gnome-common; support both
-if ! test -z "$AUTOGEN_SUBDIR_MODE"; then
-    NOCONFIGURE=1
-fi
-
-if test -z "$NOCONFIGURE"; then
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
         if test -z "$*"; then
                 echo "I am going to run ./configure with no arguments - if you wish "
                 echo "to pass any to it, please specify them on the $0 command line."
@@ -110,7 +109,7 @@ rm -rf autom4te.cache
 # regenerated from their corresponding *.in files by ./configure anyway.
 touch README INSTALL
 
-$ACLOCAL -I m4 $ACLOCAL_FLAGS || exit $?
+$ACLOCAL $ACLOCAL_FLAGS || exit $?
 
 libtoolize --force || exit $?
 gtkdocize || exit $?
@@ -121,7 +120,7 @@ $AUTOMAKE --add-missing || exit $?
 autoconf || exit $?
 cd $ORIGDIR || exit $?
 
-if test -z "$NOCONFIGURE"; then
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
         $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $?
 
         echo 

build/Makefile.am

@@ -1,4 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = \
-	win32

build/win32/Makefile.am

@@ -1,4 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = \
-	vs9

build/win32/vs9/Makefile.am

@@ -1,16 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-EXTRA_DIST += \
-	README.txt \
-	gtk+.sln \
-	gtk+.vsprops \
-	gdk-pixbuf.vcproj \
-	gdk-pixbuf-csource.vcproj \
-	gdk-pixbuf-query-loaders.vcproj \
-	gdk-win32.vcproj \
-	gdk.vcproj \
-	gdk.vcprojin \
-	gtk.vcproj \
-	gtk.vcprojin \
-	gtk-demo.vcproj \
-	install.vcproj

build/win32/vs9/README.txt

@@ -1,22 +0,0 @@
-Note that all this is rather experimental.
-
-This VS9 solution and the projects it includes are intented to be used
-in a GTK+ source tree unpacked from a tarball. In a git checkout you
-first need to use some Unix-like environment or manual work to expand
-the files needed, like config.h.win32.in into config.h.win32 and the
-.vcprojin files here into corresponding actual .vcproj files.
-
-You will need the parts from below in the GTK+ stack: pango, atk and
-glib. External dependencies are at least zlib, libpng, proxy-libintl,
-fontconfig, freetype, expat. See the corresponding README.txt file in
-glib for details where to unpack them.
-
-The "install" project will copy build results and headers into their
-appropriate location under <root>\vs9\<PlatformName>. For instance,
-built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into
-<root>\vs9\<PlatformName>\lib and GTK+ headers into
-<root>\vs9\<PlatformName>\include\gtk-2.0. This is then from where
-project files higher in the stack are supposed to look for them, not
-from a specific GLib source tree.
-
---Tor Lillqvist <tml@iki.fi>

build/win32/vs9/gdk-pixbuf-csource.vcproj

@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="gdk-pixbuf-csource"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}"
-	RootNamespace="gdkpixbufcsource"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-csource.c" />
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

build/win32/vs9/gdk-pixbuf-query-loaders.vcproj

@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdk-pixbuf-query-loaders"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}"
-	RootNamespace="gdkpixbufqueryloaders"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;$(GtkPrefixDefine);$(GdkPixbufLibdirDefine)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\gdk-pixbuf\queryloaders.c" />
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

build/win32/vs9/gdk-pixbuf.vcproj

@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdk_pixbuf"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}"
-	RootNamespace="gdk_pixbuf"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libpng.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GdkPixbufDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libpng.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libpng.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GdkPixbufDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libpng.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gdk-pixbuf.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(GtkApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf.symbols"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdk-pixbuf.def"
-						CommandLine="$(GtkGenerateGdkPixbufDef)"
-						Outputs="$(IntDir)\gdk-pixbuf.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdk-pixbuf.def"
-						CommandLine="$(GtkGenerateGdkPixbufDef)"
-						Outputs="$(IntDir)\gdk-pixbuf.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdk-pixbuf.def"
-						CommandLine="$(GtkGenerateGdkPixbufDef)"
-						Outputs="$(IntDir)\gdk-pixbuf.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdk-pixbuf.def"
-						CommandLine="$(GtkGenerateGdkPixbufDef)"
-						Outputs="$(IntDir)\gdk-pixbuf.def"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-aliasdef.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-animation.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-data.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-enum-types.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-io.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-loader.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-scale.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-scaled-anim.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-simple-anim.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixbuf-util.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\gdk-pixdata.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-ani.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-ani-animation.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-utils.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-animation.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-bmp.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-emf.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-gif.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-ico.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-jpeg.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-tiff.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gdip-wmf.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-gif-animation.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-icns.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-pcx.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-png.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-pnm.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-ras.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-tga.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-wbmp.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-xbm.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\io-xpm.c" />
-			<File RelativePath="..\..\..\gdk-pixbuf\pixops\pixops.c" />
-		</Filter>
-	</Files>
-</VisualStudioProject>

build/win32/vs9/gdk-win32.vcproj

@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdk-win32"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}"
-	RootNamespace="gdkwin32"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\gdk\win32\gdkapplaunchcontext-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkcolor-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkcursor-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkdisplay-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkdnd-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkdrawable-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkevents-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkfont-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkgc-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkgeometry-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkglobals-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkim-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkinput-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkinput.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkkeys-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkmain-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkpixmap-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkproperty-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkscreen-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkselection-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkspawn-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdktestutils-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkvisual-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkwin32id.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkwindow-win32.c" />
-		</Filter>
-	</Files>
-</VisualStudioProject>

build/win32/vs9/gdk.vcprojin

@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdk"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
-	RootNamespace="gdk"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib imm32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gdk.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GdkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gdk.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gdk.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GdkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gdk.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\..\gdk\gdk.symbols"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdk.def"
-						CommandLine="$(GtkGenerateGdkDef)"
-						Outputs="$(IntDir)\gdk.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdk.def"
-						CommandLine="$(GtkGenerateGdkDef)"
-						Outputs="$(IntDir)\gdk.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdk.def"
-						CommandLine="$(GtkGenerateGdkDef)"
-						Outputs="$(IntDir)\gdk.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gdk.def"
-						CommandLine="$(GtkGenerateGdkDef)"
-						Outputs="$(IntDir)\gdk.def"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "libgdk.sourcefiles"
-		</Filter>
-	</Files>
-</VisualStudioProject>

build/win32/vs9/gtk+.sln

@@ -1,122 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf", "gdk-pixbuf.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-csource", "gdk-pixbuf-csource.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-query-loaders", "gdk-pixbuf-query-loaders.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-win32", "gdk-win32.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk", "gdk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk", "gtk.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-demo", "gtk-demo.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC} = {FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F6}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F8}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F9}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F7}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FA}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

build/win32/vs9/gtk+.vsprops

@@ -1,389 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gtk+props"
-	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
-	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0"
-		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"
-		ForcedIncludeFiles="msvc_recommended_pragmas.h"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
-		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
-	/>
-	<Tool
-		Name="VCPreBuildEventTool"
-		CommandLine="
-if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
-copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;
-:DONE_CONFIG_H&#x0D;&#x0A;
-
-if exist ..\..\..\gdk\gdkconfig.h goto DONE_GDKCONFIG_H&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
-:DONE_GDKCONFIG_H&#x0D;&#x0A;
-"
-	/>
-	<UserMacro
-		Name="GtkApiVersion"
-		Value="3.0"
-	/>
-	<UserMacro
-		Name="GtkBinaryVersion"
-		Value="2.10.0"
-	/>
-	<UserMacro
-		Name="GtkDummyPrefix"
-		Value="/dummy"
-	/>
-	<UserMacro
-		Name="GtkPrefixDefine"
-		Value="GTK_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;"
-	/>
-	<UserMacro
-		Name="GdkPixbufIncludedLoaderDefines"
-		Value="INCLUDE_ani;INCLUDE_icns;INCLUDE_pcx;INCLUDE_ras;INCLUDE_tga;INCLUDE_png;INCLUDE_pnm;INCLUDE_wbmp;INCLUDE_xbm;INCLUDE_xpm;INCLUDE_gdiplus"
-	/>
-	<UserMacro
-		Name="GdkPixbufDefines"
-		Value="GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;$(GtkPrefixDefine);$(GdkPixbufIncludedLoaderDefines)"
-	/>
-	<UserMacro
-		Name="GdkPixbufLibdirDefine"
-		Value="PIXBUF_LIBDIR=\&quot;$(GtkDummyPrefix)/lib/gtk-$(GtkApiVersion)/$(GtkBinaryVersion)/loaders\&quot;"
-	/>
-	<UserMacro
-		Name="GdkDefines"
-		Value="GDK_COMPILATION;G_LOG_DOMAIN=\&quot;Gdk\&quot;"
-	/>
-	<UserMacro
-		Name="GtkIncludedImmodulesDefines"
-		Value="INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr"
-	/>
-	<UserMacro
-		Name="GtkDefines"
-		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs9\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_PREVIEW_COMMAND=\&quot;undefined-gtk-print-preview-command\&quot;;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(GtkApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED"
-	/>
-	<UserMacro
-		Name="GtkDoInstall"
-		Value="
-echo on&#x0D;&#x0A;
-mkdir $(OutDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin&#x0D;&#x0A;
-
-mkdir $(OutDir)\lib&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
-
-mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-animation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-core.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-enum-types.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-features.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-io.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-loader.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-marshal.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-simple-anim.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf-transform.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-copy ..\..\..\gdk-pixbuf\gdk-pixdata.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-
-mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdk.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkapplaunchcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcairo.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcolor.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkcursor.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdisplay.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdisplaymanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdnd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkdrawable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkenumtypes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkevents.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkfont.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkgc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdki18n.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkinput.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkkeys.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkkeysyms.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkpango.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkpixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkpixmap.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkproperty.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkregion.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkrgb.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkscreen.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkselection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkspawn.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdktestutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdktypes.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkvisual.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\win32\gdkwin32.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-
-mkdir $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtk.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaboutdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccelgroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccellabel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccelmap.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaccessible.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkactiongroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkactivatable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkadjustment.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkalignment.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkarrow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkaspectframe.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkassistant.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbin.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbindings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbuildable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbuilder.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcalendar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcelleditable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcelllayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendereraccel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderercombo.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererprogress.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrendererspin.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderertext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellrenderertoggle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcellview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcheckbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcheckmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkclipboard.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkclist.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcolorseldialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcombo.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcombobox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcomboboxentry.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcontainer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkctree.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkcurve.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdebug.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdnd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkdrawingarea.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkeditable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentry.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentrybuffer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkentrycompletion.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkenums.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkeventbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkexpander.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilechooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilefilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfilesel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfixed.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkfontsel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkframe.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgamma.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkgc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhandlebox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhruler.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkhsv.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkiconfactory.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkicontheme.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkiconview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimage.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimagemenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimcontextsimple.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimmodule.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkimmulticontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkinfobar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkinputdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkinvisible.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkitemfactory.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklabel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklinkbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklist.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtklistitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkliststore.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmain.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmarshal.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenubar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenushell.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmenutoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmessagedialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmisc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmodules.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkmountoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtknotebook.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkobject.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkoldeditable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkoptionmenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkorientable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpagesetup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpapersize.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpixmap.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkplug.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkpreview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintcontext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintoperation.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintoperationpreview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprintsettings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprivate.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprogress.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkprogressbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradioaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiobutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiomenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkradiotoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrange.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooser.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooserdialog.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchoosermenu.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentchooserwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentfilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkrecentmanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkruler.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscalebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkscrolledwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkselection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparatormenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkseparatortoolitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksettings.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkshow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksignal.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksizegroup.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtksocket.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkspinbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstatusbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstatusicon.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstock.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkstyle.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktearoffmenuitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktestutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextbuffer.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextbufferrichtext.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextchild.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextdisplay.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextiter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextlayout.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextmark.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktexttag.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktexttagtable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktextview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktipsquery.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoggleaction.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktogglebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoggletoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolbutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktoolshell.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktooltip.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktooltips.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktree.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreednd.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeitem.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodel.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodelfilter.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreemodelsort.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeselection.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreesortable.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreestore.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeview.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktreeviewcolumn.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktypebuiltins.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtktypeutils.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkuimanager.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvbbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvbox.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkversion.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkviewport.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvolumebutton.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvpaned.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvruler.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvscale.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvscrollbar.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkvseparator.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-copy ..\..\..\gtk\gtkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
-
-mkdir $(OutDir)\lib\gtk-$(GtkApiVersion)\include&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkconfig.h $(OutDir)\lib\gtk-$(GtkApiVersion)\include&#x0D;&#x0A;
-
-copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
-"
-	/>
-	<UserMacro
-		Name="GtkGenerateGdkPixbufDef"
-		Value="echo EXPORTS &gt;&quot;$(IntDir)\gdk-pixbuf.def&quot; &amp;&amp; cl /EP -DG_OS_WIN32 -DINCLUDE_VARIABLES -DALL_FILES -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= ..\..\..\gdk-pixbuf\gdk-pixbuf.symbols &gt;&gt;&quot;$(IntDir)\gdk-pixbuf.def&quot;"
-	/>
-	<UserMacro
-		Name="GtkGenerateGdkDef"
-		Value="echo EXPORTS &gt;&quot;$(IntDir)\gdk.def&quot; &amp;&amp; cl /EP -DGDK_WINDOWING_WIN32 -DALL_FILES -DG_GNUC_CONST= ..\..\..\gdk\gdk.symbols &gt;&gt;&quot;$(IntDir)\gdk.def&quot;"
-	/>
-	<UserMacro
-		Name="GtkGenerateGtkDef"
-		Value="echo EXPORTS &gt;&quot;$(IntDir)\gtk.def&quot; &amp;&amp; cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols &gt;&gt;&quot;$(IntDir)\gtk.def&quot;"
-	/>
-	<UserMacro
-		Name="GtkLibtoolCompatibleDllPrefix"
-		Value="lib"
-	/>
-	<UserMacro
-		Name="GtkLibtoolCompatibleDllSuffix"
-		Value="-$(GtkApiVersion)-0"
-	/>
-	<UserMacro
-		Name="GtkSeparateVS9DllPrefix"
-		Value=""
-	/>
-	<UserMacro
-		Name="GtkSeparateVS9DllSuffix"
-		Value="-2-vs9"
-	/>
-	<!-- Change these two to GtkLibtoolCompatibleDllPrefix and
-	GtkLibtoolCompatibleDllSuffix if that is what you want -->
-	<UserMacro
-		Name="GtkDllPrefix"
-		Value="$(GtkLibtoolCompatibleDllPrefix)"
-	/>
-	<UserMacro
-		Name="GtkDllSuffix"
-		Value="$(GtkLibtoolCompatibleDllSuffix)"
-	/>
-	<UserMacro
-		Name="GlibEtcInstallRoot"
-		Value="..\..\..\..\..\vs9\$(PlatformName)"
-	/>
-</VisualStudioPropertySheet>

build/win32/vs9/gtk-demo.vcproj

@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk-demo"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FC}"
-	RootNamespace="gtkdemo"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib pango-1.0.lib pangocairo-1.0.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="$(GtkPrefixDefine)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="$(GtkPrefixDefine)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\demos\gtk-demo\appwindow.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\assistant.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\builder.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\button_box.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\changedisplay.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\clipboard.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\colorsel.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\combobox.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\dialog.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\drawingarea.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\editable_cells.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\entry_buffer.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\entry_completion.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\expander.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\hypertext.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\iconview.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\iconview_edit.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\images.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\infobar.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\links.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\list_store.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\main.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\menus.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\offscreen_window.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\offscreen_window2.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\panes.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\pickers.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\pixbufs.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\printing.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\rotated_text.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\search_entry.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\sizegroup.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\spinner.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\stock_browser.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\textscroll.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\textview.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\toolpalette.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\tree_store.c" />
-			<File RelativePath="..\..\..\demos\gtk-demo\ui_manager.c" />
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

build/win32/vs9/gtk.vcprojin

@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073F5}"
-	RootNamespace="gtk"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="_DEBUG;$(GtkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gtk.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GtkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gtk.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;$(GtkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gtk.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk-pixbuf;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GtkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib atk-1.0.lib pango-1.0.lib pangocairo-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\gtk.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-win32-$(GtkApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\..\gdk\gtk.symbols"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gtk.def"
-						CommandLine="$(GtkGenerateGtkDef)"
-						Outputs="$(IntDir)\gtk.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gtk.def"
-						CommandLine="$(GtkGenerateGtkDef)"
-						Outputs="$(IntDir)\gtk.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gtk.def"
-						CommandLine="$(GtkGenerateGtkDef)"
-						Outputs="$(IntDir)\gtk.def"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating gtk.def"
-						CommandLine="$(GtkGenerateGtkDef)"
-						Outputs="$(IntDir)\gtk.def"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "libgtk.sourcefiles"
-			<File RelativePath="..\..\..\modules\input\gtkimcontextime.c" />
-			<File RelativePath="..\..\..\modules\input\gtkimcontextmultipress.c" />
-			<File RelativePath="..\..\..\modules\input\gtkimcontextthai.c" />
-			<File RelativePath="..\..\..\modules\input\imam-et.c" />
-			<File RelativePath="..\..\..\modules\input\imcedilla.c" />
-			<File RelativePath="..\..\..\modules\input\imcyrillic-translit.c" />
-			<File RelativePath="..\..\..\modules\input\imime.c" />
-			<File RelativePath="..\..\..\modules\input\iminuktitut.c" />
-			<File RelativePath="..\..\..\modules\input\imipa.c" />
-			<File RelativePath="..\..\..\modules\input\immultipress.c" />
-			<File RelativePath="..\..\..\modules\input\imthai.c" />
-			<File RelativePath="..\..\..\modules\input\imti-er.c" />
-			<File RelativePath="..\..\..\modules\input\imti-et.c" />
-			<File RelativePath="..\..\..\modules\input\imviqr.c" />
-			<File RelativePath="..\..\..\modules\input\thai-charprop.c" />
-		</Filter>
-	</Files>
-</VisualStudioProject>

build/win32/vs9/install.vcproj

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="install"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
-	RootNamespace="install"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			
-ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(GtkDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(GtkDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(GtkDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk+.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(GtkDoInstall)"
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioProject>

config.h.win32.in

@@ -5,9 +5,6 @@
 /* always defined to indicate that i18n is enabled */
 #define ENABLE_NLS 1
 
-/* Define if gio can sniff image data */
-/* #undef GDK_PIXBUF_USE_GIO_MIME */
-
 /* The prefix for our gettext translation domains. */
 #define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
 
@@ -15,7 +12,7 @@
 #define GTK_COMPILED_WITH_DEBUGGING "yes"
 
 /* Define the location where the catalogs will be installed */
-#define GTK_LOCALEDIR "NONE/share/locale"
+#define GTK_LOCALEDIR "c:/devel/target/HEAD/share/locale"
 
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
@@ -100,9 +97,6 @@
 /* Define to 1 if you have a working `mmap' system call. */
 /* #undef HAVE_MMAP */
 
-/* Define to 1 if libpapi available */
-/* #undef HAVE_PAPI */
-
 /* Define to 1 is libjpeg supports progressive JPEG */
 /* #undef HAVE_PROGRESSIVE_JPEG */
 
@@ -112,6 +106,9 @@
 /* Have the Xrandr extension library */
 /* #undef HAVE_RANDR */
 
+/* Define to 1 if the XShape extension is available */
+/* #undef HAVE_SHAPE_EXT */
+
 /* Define to 1 if shm.h is available */
 /* #undef HAVE_SHM_H */
 
@@ -202,7 +199,7 @@
 /* Define to 1 if XFree Xinerama is available */
 /* #undef HAVE_XFREE_XINERAMA */
 
-/* Define to 1 if xinerama is available */
+/* Define to 1 is Xinerama is available */
 /* #undef HAVE_XINERAMA */
 
 /* Define to 1 if you have the `XInternAtoms' function. */
@@ -232,23 +229,12 @@
 /* Define to 1 if you have the `_NSGetEnviron' function. */
 /* #undef HAVE__NSGETENVIRON */
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
 /* Define if <X11/extensions/XIproto.h> needed for xReply */
 /* #undef NEED_XIPROTO_H_FOR_XREPLY */
 
 /* Define to 1 if fd_set is not available */
 #define NO_FD_SET 1
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#ifndef _MSC_VER
-/* #undef NO_MINUS_C_MINUS_O */
-#else 
-#define NO_MINUS_C_MINUS_O 1
-#endif
-
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B"
 

contrib/Makefile.am

@@ -0,0 +1,8 @@
+include $(top_srcdir)/Makefile.decl
+
+SUBDIRS =
+if USE_X11
+SUBDIRS += gdk-pixbuf-xlib
+endif
+
+-include $(top_srcdir)/git.mk

contrib/gdk-pixbuf-xlib/ChangeLog

@@ -0,0 +1,354 @@
+=== ChangeLog discontinued ===
+
+	With the move to git, GTK+ is switching from a ChangeLog file
+	to relying on commit messages to provide change history. Please
+	see README.commits for guidance on the expected message format.
+
+2009-03-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.16.0 ===
+
+2009-03-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.5 ===
+
+2009-02-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.4 ===
+
+2009-02-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.3 ===
+
+2009-01-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.2 ===
+
+2009-01-23  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.1 ===
+
+2009-01-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.15.0 ===
+
+2008-09-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.14.2 ===
+
+2008-09-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.14.1 ===
+
+2008-09-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.14.0 ===
+
+2008-08-18  Matthias Clasen  <mclasen@redhat.com>
+
+	* ==== Released 2.13.7 ===
+
+2008-08-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.13.6 ===
+
+2008-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.13.5 ===
+
+2008-07-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.13.4 ===
+
+2008-06-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.13.3 ===
+
+2008-06-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.13.2 ===
+
+2008-05-29  Matthias Clasen <mclasen@redhat.com>
+
+	* === Released 2.13.1 ===
+
+2008-05-26  Michael Natterer  <mitch@imendio.com>
+
+	* gdk-pixbuf-xlib.h
+	* gdk-pixbuf-xlibrgb.h: use G_BEGIN/END_DECLS.
+
+2008-02-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.13.0 ===
+
+2007-10-16  Matthias Clasen <mclasen@redhat.com>
+
+	* === Released 2.12.1 ===
+
+2007-09-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.12.0 ===
+
+2007-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.6 ===
+
+2007-07-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.5 ===
+
+2007-06-19  Matthias Clasen <mclasen@redhat.com>
+
+	* === Released 2.11.4 ===
+
+2007-06-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.3 ===
+
+2007-06-06  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.2 ===
+
+2007-06-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.1 ===
+
+2007-05-24   Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.11.0 ===
+
+2006-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf-xlib.c: Apply a cleanup patch by
+	Kjartan	Maraas  (#341812)
+
+2006-08-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.10.2 ===
+
+2006-07-23  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.10.1 ===
+
+2006-07-02  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.10.0 ===
+
+2006-06-21  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.9.4 ===
+
+2006-06-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.9.3 ===
+
+2006-06-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.9.2 ===
+
+2006-05-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.9.1 ====
+
+2006-05-04  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.9.0 ===
+
+2005-11-17  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf-xlib-drawable.c: 
+	* gdk-pixbuf-xlibrgb.c: const correctness fixes
+	found by Arjan van de Ven and gcc.
+
+2005-10-05  Matthias Clasen  <mclasen@redhat.com>
+
+	* gdk-pixbuf-xlib-2.0.pc.in (Requires): Require
+	gmodule-no-export-2.0 instead of gmodule-2.0
+
+2005-08-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.8.2 ===
+
+	* === Released 2.8.1 ===
+
+2005-08-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.8.0 ===
+
+2005-08-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.7.5 ===
+
+2005-07-22  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.7.4 === 
+
+2005-07-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.7.3 ===
+	
+2005-07-08  Matthias Clasen  <mclasen@redhat.com>
+	
+	* === Released 2.7.2 ===
+
+2005-07-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.7.1 ===
+	
+2005-06-20  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.7.0 ===
+
+2005-01-08  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.1 ===
+	
+2004-12-16  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.6.0 ===
+
+2004-12-02  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.6 ===
+
+2004-11-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.5 ===
+
+2004-10-27  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.4 ===
+
+2004-09-19  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.3 ===
+
+2004-08-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.2 ===
+
+2004-08-01  Matthias Clasen  <mclasen@redhat.com>
+
+	* === Released 2.5.1 ===
+
+Tue Jul 20 23:26:10 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk-pixbuf-xlibrgb.c:  Include config.h first.  (#148034)
+
+Sun Jul 18 20:17:41 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+	* === released 2.5.0 ==
+
+Tue Mar  9 09:33:54 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 2.3.6 ===
+
+Wed Mar  3 15:50:28 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* Makefile.am (libgdk_pixbuf_xlib_2_0_la_LIBADD): Add 
+	a shared library dependency on libgdk-pixbuf (#124687)
+
+Tue Feb 24 14:45:03 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* === Released 2.3.3 ===
+
+Fri Feb 13 10:32:09 2004  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk-pixbuf-xlibrgb.h: Remove a couple of unneeded
+	#includes. Isn't unsupported code fun?
+	(133833, Gregory Merchan)
+
+Tue Oct  7 23:30:00 2003  Matthias Clasen  <maclas@gmx.de>
+
+	* gdk-pixbuf-xlib.h: Add C++ guards. (123955, Harring Figueiredo)
+
+2002-08-06  jacob berkman  <jacob@ximian.com>
+
+	* Makefile.am (lib_LTLIBRARIES): link against xlibs
+
+2002-01-25  Federico Mena Quintero  <federico@ximian.com>
+
+	Merge from gdk-pixbuf stable.
+
+	* gdk-pixbuf-xlib-drawable.c (rgb565msb): Fixed the endianness
+	conversion --- swap the individual 16 bit values instead of taking
+	everying as a 32 bit value.
+	(rgb565lsb): Likewise.
+	(rgb555lsb): Likewise.
+	(rgb555msb): Likewise.
+
+2001-11-26  Akira TAGOH  <tagoh@redhat.com>
+
+	* Makefile.am (libgdk_pixbuf_xlib_1_3_la_LDFLAGS):
+	Added -version-info.
+
+2001-05-19  Havoc Pennington  <hp@pobox.com>
+
+	* gdk-pixbuf-xlibrgb.c: docs
+
+2001-06-04  Havoc Pennington  <hp@redhat.com>
+
+	* gdk-pixbuf-xlibrgb.c (xlib_rgb_init): remove C++ comment,
+	reported by Dan McNichol
+
+Mon Jan  8 11:41:41 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* Makefile.am (INCLUDES): Add @x_cflags@ (#36310)
+
+2001-01-02  Havoc Pennington  <hp@redhat.com>
+
+	* gdk-pixbuf-xlib-2.0.pc.in (Description): fix up description a bit.
+
+2000-10-06  Havoc Pennington  <hp@redhat.com>
+
+	* gdk-pixbuf-xlib.c: Put display/screen here, instead of in 
+	the main gdk-pixbuf library as it was in 1.0; since the io-xpm 
+	loader doesn't use these variables anymore it should be OK
+
+2000-09-26  Federico Mena Quintero  <federico@helixcode.com>
+
+	* gdk-pixbuf/gdk-pixbuf-xlib-drawable.c
+	(gdk_pixbuf_xlib_get_from_drawable): Do not use
+	gdk_screen_{width,height}().  Thanks to John Harper for pointing
+	this out.
+
+2000-08-26  Federico Mena Quintero  <federico@helixcode.com>
+
+	* gdk-pixbuf/gdk-pixbuf-xlibrgb.c: Added API reference docs.
+
+2000-08-25  Federico Mena Quintero  <federico@helixcode.com>
+
+	* gdk-pixbuf/gdk-pixbuf-xlib-drawable.c (handle_x_error): Return
+	0.
+	(xlib_window_is_viewable): Return FALSE in the last case.
+
+	* gdk-pixbuf/gdk-pixbuf-xlib-render.c: Updated the inline docs.
+
+	* gdk-pixbuf/gdk-pixbuf-xlib.c: Added API docs.
+
+2000-08-25  John Harper  <john@dcs.warwick.ac.uk>
+
+	Work to create an Xlib version of gdk-pixbuf (with the Xlib
+	port of GdkRGB for rendering):
+
+	* configure.in: check for X libraries, set and substitute
+	GDK_PIXBUF_XLIB_{LIBDIR,INCLUDEDIR,LIBS} variables
+
+	* gdk_pixbuf_xlibConf.sh.in: new file -- gnome-config details
+	for the gdk-pixbuf-xlib library
+	* Makefile.am: build and install gdk_pixbuf_xlibConf.sh
+
+	* gdk-pixbuf/gdk-pixbuf-xlib-render.c,
+	gdk-pixbuf/gdk-pixbuf-xlib.c, gdk-pixbuf/gdk-pixbuf-xlib.h,
+	gdk-pixbuf/gdk-pixbuf-xlib-private.h,
+	gdk-pixbuf/gdk-pixbuf-xlib-drawable.c: new files, ported the
+	GDK dependent parts of gdk-pixbuf to use Xlib. Functions that
+	were called gdk_pixbuf_FOO are now gdk_pixbuf_xlib_FOO
+
+	* gdk-pixbuf/gdk-pixbuf-xlibrgb.c,
+	gdk-pixbuf/gdk-pixbuf-xlibrgb.h: added Chris Blizzard's Xlib
+	port of GdkRGB (from Mozilla CVS)
+
+	* gdk-pixbuf/Makefile.am: build a library libgdk_pixbuf_xlib.la
+	including the non-GDK dependent objects from libgdk_pixbuf.la
+	plus the Xlib ports and xlibrgb

contrib/gdk-pixbuf-xlib/Makefile.am

@@ -0,0 +1,42 @@
+include $(top_srcdir)/Makefile.decl
+
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+
+lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la
+
+INCLUDES = \
+	-I$(top_srcdir) -I$(top_builddir) 	\
+	-I$(top_srcdir)/gdk-pixbuf 		\
+	-I$(top_srcdir)/contrib 		\
+	$(GDK_PIXBUF_XLIB_DEP_CFLAGS)
+
+libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
+	-export-dynamic						\
+	$(no_undefined)						\
+	-version-info $(LT_VERSION_INFO)
+
+libgdk_pixbuf_xlib_2_0_la_LIBADD = \
+        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+	$(GDK_PIXBUF_XLIB_DEP_LIBS)
+
+libgdk_pixbuf_xlib_2_0_la_SOURCES =         \
+	gdk-pixbuf-xlib-private.h	\
+        gdk-pixbuf-xlib.c               \
+        gdk-pixbuf-xlib-render.c        \
+        gdk-pixbuf-xlib-drawable.c      \
+        gdk-pixbuf-xlibrgb.c
+
+libgdk_pixbuf_xlibincludedir=$(includedir)/gtk-2.0/gdk-pixbuf-xlib
+
+libgdk_pixbuf_xlibinclude_HEADERS =         		\
+        gdk-pixbuf-xlib.h               	    	\
+        gdk-pixbuf-xlibrgb.h
+
+pkgconfigdir   = $(libdir)/pkgconfig
+pkgconfig_DATA = gdk-pixbuf-xlib-2.0.pc
+
+EXTRA_DIST += gdk-pixbuf-xlib-2.0.pc.in
+
+-include $(top_srcdir)/git.mk

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in

@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: GdkPixbuf Xlib
+Description: GdkPixbuf rendering for Xlib
+Version: @VERSION@
+Requires: gobject-2.0,gmodule-no-export-2.0,gdk-pixbuf-2.0
+Libs: -L${libdir} -lgdk_pixbuf_xlib-@GTK_API_VERSION@
+Cflags: -I${includedir}

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-private.h

@@ -0,0 +1,30 @@
+/* GdkPixbuf library - Xlib header file
+ *
+ * Authors: John Harper <john@dcs.warwick.ac.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef GDK_PIXBUF_XLIB_PRIVATE_H
+#define GDK_PIXBUF_XLIB_PRIVATE_H
+
+#include "gdk-pixbuf-xlib.h"
+#include <X11/Xlib.h>
+
+extern Display *gdk_pixbuf_dpy;
+extern int gdk_pixbuf_screen;
+
+#endif

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-render.c

@@ -0,0 +1,398 @@
+/* GdkPixbuf library - Rendering functions
+ *
+ * Copyright (C) 1999 The Free Software Foundation
+ *
+ * Author: Federico Mena-Quintero <federico@gimp.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/* Trivially ported to Xlib(RGB) by John Harper. */
+
+#include "config.h"
+#include "gdk-pixbuf-private.h"
+#include "gdk-pixbuf-xlib-private.h"
+
+
+
+/**
+ * gdk_pixbuf_xlib_render_threshold_alpha:
+ * @pixbuf: A pixbuf.
+ * @bitmap: Bitmap where the bilevel mask will be painted to.
+ * @src_x: Source X coordinate.
+ * @src_y: source Y coordinate.
+ * @dest_x: Destination X coordinate.
+ * @dest_y: Destination Y coordinate.
+ * @width: Width of region to threshold.
+ * @height: Height of region to threshold.
+ * @alpha_threshold: Opacity values below this will be painted as zero; all
+ * other values will be painted as one.
+ *
+ * Takes the opacity values in a rectangular portion of a pixbuf and thresholds
+ * them to produce a bi-level alpha mask that can be used as a clipping mask for
+ * a drawable.
+ *
+ **/
+void
+gdk_pixbuf_xlib_render_threshold_alpha (GdkPixbuf *pixbuf, Pixmap bitmap,
+					int src_x, int src_y,
+					int dest_x, int dest_y,
+					int width, int height,
+					int alpha_threshold)
+{
+	GC gc;
+	XColor color;
+	int x, y;
+	guchar *p;
+	int start, start_status;
+	int status;
+	XGCValues gcv;
+
+	g_return_if_fail (pixbuf != NULL);
+	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
+	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
+	g_return_if_fail (pixbuf->bits_per_sample == 8);
+
+	g_return_if_fail (bitmap != 0);
+	g_return_if_fail (width >= 0 && height >= 0);
+	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
+	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
+
+	g_return_if_fail (alpha_threshold >= 0 && alpha_threshold <= 255);
+
+	if (width == 0 || height == 0)
+		return;
+
+	gc = XCreateGC (gdk_pixbuf_dpy, bitmap, 0, &gcv);
+
+	if (!pixbuf->has_alpha) {
+		color.pixel = (alpha_threshold == 255) ? 0 : 1;
+		XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
+		XFillRectangle (gdk_pixbuf_dpy, bitmap, gc,
+				dest_x, dest_y, width, height);
+		XFreeGC (gdk_pixbuf_dpy, gc);
+		return;
+	}
+
+	color.pixel = 0;
+	XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
+	XFillRectangle (gdk_pixbuf_dpy, bitmap, gc,
+			dest_x, dest_y, width, height);
+
+	color.pixel = 1;
+	XSetForeground (gdk_pixbuf_dpy, gc, color.pixel);
+
+	for (y = 0; y < height; y++) {
+		p = (pixbuf->pixels + (y + src_y) * pixbuf->rowstride + src_x * pixbuf->n_channels
+		     + pixbuf->n_channels - 1);
+
+		start = 0;
+		start_status = *p < alpha_threshold;
+
+		for (x = 0; x < width; x++) {
+			status = *p < alpha_threshold;
+
+			if (status != start_status) {
+				if (!start_status)
+					XDrawLine (gdk_pixbuf_dpy, bitmap, gc,
+						   start + dest_x, y + dest_y,
+						   x - 1 + dest_x, y + dest_y);
+
+				start = x;
+				start_status = status;
+			}
+
+			p += pixbuf->n_channels;
+		}
+
+		if (!start_status)
+			XDrawLine (gdk_pixbuf_dpy, bitmap, gc,
+				   start + dest_x, y + dest_y,
+				   x - 1 + dest_x, y + dest_y);
+	}
+
+	XFreeGC (gdk_pixbuf_dpy, gc);
+}
+
+
+
+/* Creates a buffer by stripping the alpha channel of a pixbuf */
+static guchar *
+remove_alpha (GdkPixbuf *pixbuf, int x, int y, int width, int height, int *rowstride)
+{
+	guchar *buf;
+	int xx, yy;
+	guchar *src, *dest;
+
+	g_assert (pixbuf->n_channels == 4);
+	g_assert (pixbuf->has_alpha);
+	g_assert (width > 0 && height > 0);
+	g_assert (x >= 0 && x + width <= pixbuf->width);
+	g_assert (y >= 0 && y + height <= pixbuf->height);
+
+	*rowstride = 4 * ((width * 3 + 3) / 4);
+
+	buf = g_new (guchar, *rowstride * height);
+
+	for (yy = 0; yy < height; yy++) {
+		src = pixbuf->pixels + pixbuf->rowstride * (yy + y) + x * pixbuf->n_channels;
+		dest = buf + *rowstride * yy;
+
+		for (xx = 0; xx < width; xx++) {
+			*dest++ = *src++;
+			*dest++ = *src++;
+			*dest++ = *src++;
+			src++;
+		}
+	}
+
+	return buf;
+}
+
+/**
+ * gdk_pixbuf_xlib_render_to_drawable:
+ * @pixbuf: A pixbuf.
+ * @drawable: Destination drawable.
+ * @gc: GC used for rendering.
+ * @src_x: Source X coordinate within pixbuf.
+ * @src_y: Source Y coordinate within pixbuf.
+ * @dest_x: Destination X coordinate within drawable.
+ * @dest_y: Destination Y coordinate within drawable.
+ * @width: Width of region to render, in pixels.
+ * @height: Height of region to render, in pixels.
+ * @dither: Dithering mode for XlibRGB.
+ * @x_dither: X offset for dither.
+ * @y_dither: Y offset for dither.
+ *
+ * Renders a rectangular portion of a pixbuf to a drawable while using the
+ * specified GC.  This is done using XlibRGB, so the specified drawable must
+ * have the XlibRGB visual and colormap.  Note that this function will ignore
+ * the opacity information for images with an alpha channel; the GC must already
+ * have the clipping mask set if you want transparent regions to show through.
+ *
+ * For an explanation of dither offsets, see the XlibRGB documentation.  In
+ * brief, the dither offset is important when re-rendering partial regions of an
+ * image to a rendered version of the full image, or for when the offsets to a
+ * base position change, as in scrolling.  The dither matrix has to be shifted
+ * for consistent visual results.  If you do not have any of these cases, the
+ * dither offsets can be both zero.
+ **/
+void
+gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf,
+				    Drawable drawable, GC gc,
+				    int src_x, int src_y,
+				    int dest_x, int dest_y,
+				    int width, int height,
+				    XlibRgbDither dither,
+				    int x_dither, int y_dither)
+{
+	guchar *buf;
+	int rowstride;
+
+	g_return_if_fail (pixbuf != NULL);
+	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
+	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
+	g_return_if_fail (pixbuf->bits_per_sample == 8);
+
+	g_return_if_fail (drawable != 0);
+	g_return_if_fail (gc != 0);
+
+	g_return_if_fail (width >= 0 && height >= 0);
+	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
+	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
+
+	if (width == 0 || height == 0)
+		return;
+
+	/* This will have to be modified once we support other image types.
+	 * Also, GdkRGB does not have gdk_draw_rgb_32_image_dithalign(), so we
+	 * have to pack the buffer first.  Sigh.
+	 */
+
+	if (pixbuf->has_alpha)
+		buf = remove_alpha (pixbuf, src_x, src_y, width, height, &rowstride);
+	else {
+		buf = pixbuf->pixels + src_y * pixbuf->rowstride + src_x * 3;
+		rowstride = pixbuf->rowstride;
+	}
+
+	xlib_draw_rgb_image_dithalign (drawable, gc,
+				       dest_x, dest_y,
+				       width, height,
+				       dither,
+				       buf, rowstride,
+				       x_dither, y_dither);
+
+	if (pixbuf->has_alpha)
+		g_free (buf);
+}
+
+
+
+/**
+ * gdk_pixbuf_xlib_render_to_drawable_alpha:
+ * @pixbuf: A pixbuf.
+ * @drawable: Destination drawable.
+ * @src_x: Source X coordinate within pixbuf.
+ * @src_y: Source Y coordinates within pixbuf.
+ * @dest_x: Destination X coordinate within drawable.
+ * @dest_y: Destination Y coordinate within drawable.
+ * @width: Width of region to render, in pixels.
+ * @height: Height of region to render, in pixels.
+ * @alpha_mode: If the image does not have opacity information, this is ignored.
+ * Otherwise, specifies how to handle transparency when rendering.
+ * @alpha_threshold: If the image does have opacity information and @alpha_mode
+ * is GDK_PIXBUF_ALPHA_BILEVEL, specifies the threshold value for opacity
+ * values.
+ * @dither: Dithering mode for XlibRGB.
+ * @x_dither: X offset for dither.
+ * @y_dither: Y offset for dither.
+ *
+ * Renders a rectangular portion of a pixbuf to a drawable.  This is done using
+ * XlibRGB, so the specified drawable must have the XlibRGB visual and colormap.
+ *
+ * When used with #GDK_PIXBUF_ALPHA_BILEVEL, this function has to create a bitmap
+ * out of the thresholded alpha channel of the image and, it has to set this
+ * bitmap as the clipping mask for the GC used for drawing.  This can be a
+ * significant performance penalty depending on the size and the complexity of
+ * the alpha channel of the image.  If performance is crucial, consider handling
+ * the alpha channel yourself (possibly by caching it in your application) and
+ * using gdk_pixbuf_xlib_render_to_drawable() or GdkRGB directly instead.
+ **/
+void
+gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf, Drawable drawable,
+					  int src_x, int src_y,
+					  int dest_x, int dest_y,
+					  int width, int height,
+					  GdkPixbufAlphaMode alpha_mode,
+					  int alpha_threshold,
+					  XlibRgbDither dither,
+					  int x_dither, int y_dither)
+{
+	Pixmap bitmap = 0;
+	GC gc;
+	XGCValues gcv;
+
+	g_return_if_fail (pixbuf != NULL);
+	g_return_if_fail (pixbuf->colorspace == GDK_COLORSPACE_RGB);
+	g_return_if_fail (pixbuf->n_channels == 3 || pixbuf->n_channels == 4);
+	g_return_if_fail (pixbuf->bits_per_sample == 8);
+
+	g_return_if_fail (drawable != 0);
+	g_return_if_fail (width >= 0 && height >= 0);
+	g_return_if_fail (src_x >= 0 && src_x + width <= pixbuf->width);
+	g_return_if_fail (src_y >= 0 && src_y + height <= pixbuf->height);
+
+	if (width == 0 || height == 0)
+		return;
+
+	gc = XCreateGC (gdk_pixbuf_dpy, drawable, 0, &gcv);
+
+	if (pixbuf->has_alpha) {
+		/* Right now we only support GDK_PIXBUF_ALPHA_BILEVEL, so we
+		 * unconditionally create the clipping mask.
+		 */
+
+		bitmap = XCreatePixmap (gdk_pixbuf_dpy,
+					RootWindow (gdk_pixbuf_dpy,
+						    gdk_pixbuf_screen),
+					width, height, 1);
+		gdk_pixbuf_xlib_render_threshold_alpha (pixbuf, bitmap,
+							src_x, src_y,
+							0, 0,
+							width, height,
+							alpha_threshold);
+
+		XSetClipMask (gdk_pixbuf_dpy, gc, bitmap);
+		XSetClipOrigin (gdk_pixbuf_dpy, gc, dest_x, dest_y);
+	}
+
+	gdk_pixbuf_xlib_render_to_drawable (pixbuf, drawable, gc,
+					    src_x, src_y,
+					    dest_x, dest_y,
+					    width, height,
+					    dither,
+					    x_dither, y_dither);
+
+	if (bitmap)
+	        XFreePixmap (gdk_pixbuf_dpy, bitmap);
+
+	XFreeGC (gdk_pixbuf_dpy, gc);
+}
+
+/**
+ * gdk_pixbuf_xlib_render_pixmap_and_mask:
+ * @pixbuf: A pixbuf.
+ * @pixmap_return: Return value for the created pixmap.
+ * @mask_return: Return value for the created mask.
+ * @alpha_threshold: Threshold value for opacity values.
+ *
+ * Creates a pixmap and a mask bitmap which are returned in the @pixmap_return
+ * and @mask_return arguments, respectively, and renders a pixbuf and its
+ * corresponding tresholded alpha mask to them.  This is merely a convenience
+ * function; applications that need to render pixbufs with dither offsets or to
+ * given drawables should use gdk_pixbuf_xlib_render_to_drawable_alpha() or
+ * gdk_pixbuf_xlib_render_to_drawable(), and
+ * gdk_pixbuf_xlib_render_threshold_alpha().
+ *
+ * If the pixbuf does not have an alpha channel, then *@mask_return will be set
+ * to None.
+ **/
+void
+gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
+					Pixmap *pixmap_return,
+					Pixmap *mask_return,
+					int alpha_threshold)
+{
+        g_return_if_fail (pixbuf != NULL);
+
+	if (pixmap_return) {
+		GC gc;
+		XGCValues gcv;
+
+		*pixmap_return = XCreatePixmap (gdk_pixbuf_dpy,
+						RootWindow (gdk_pixbuf_dpy,
+							    gdk_pixbuf_screen),
+						pixbuf->width,
+						pixbuf->height,
+						xlib_rgb_get_depth ());
+		gc = XCreateGC (gdk_pixbuf_dpy, *pixmap_return, 0, &gcv);
+		gdk_pixbuf_xlib_render_to_drawable (pixbuf, *pixmap_return, gc,
+						    0, 0, 0, 0,
+						    pixbuf->width,
+						    pixbuf->height,
+						    XLIB_RGB_DITHER_NORMAL,
+						    0, 0);
+		XFreeGC (gdk_pixbuf_dpy, gc);
+	}
+
+	if (mask_return) {
+		if (pixbuf->has_alpha) {
+		    *mask_return = XCreatePixmap (gdk_pixbuf_dpy,
+						  RootWindow (gdk_pixbuf_dpy,
+							      gdk_pixbuf_screen),
+						  pixbuf->width,
+						  pixbuf->height, 1);
+		    gdk_pixbuf_xlib_render_threshold_alpha (pixbuf,
+							    *mask_return,
+							    0, 0, 0, 0,
+							    pixbuf->width,
+							    pixbuf->height,
+							    alpha_threshold);
+		} else
+			*mask_return = 0;
+	}
+}

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c

@@ -0,0 +1,63 @@
+/* GdkPixbuf library - Initialization functions
+ *
+ * Author: John Harper <john@dcs.warwick.ac.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+#include <X11/Xlib.h>
+#include <gdk-pixbuf/gdk-pixbuf-private.h>
+#include "gdk-pixbuf-xlib-private.h"
+
+Display *gdk_pixbuf_dpy = NULL;
+int gdk_pixbuf_screen = -1;
+
+/**
+ * gdk_pixbuf_xlib_init:
+ * @display: X display to use.
+ * @screen_num: Screen number.
+ * 
+ * Initializes the gdk-pixbuf Xlib machinery by calling xlib_rgb_init().  This
+ * function should be called near the beginning of your program, or before using
+ * any of the gdk-pixbuf-xlib functions.
+ **/
+void
+gdk_pixbuf_xlib_init (Display *display, int screen_num)
+{
+    xlib_rgb_init (display, ScreenOfDisplay (display, screen_num));
+    gdk_pixbuf_dpy = display;
+    gdk_pixbuf_screen = screen_num;
+}
+
+/**
+ * gdk_pixbuf_xlib_init_with_depth:
+ * @display: X display to use.
+ * @screen_num: Screen number.
+ * @prefDepth: Preferred depth for XlibRGB.
+ * 
+ * Similar to gdk_pixbuf_xlib_init(), but also lets you specify the preferred
+ * depth for XlibRGB if you do not want it to use the default depth it picks.
+ **/
+void
+gdk_pixbuf_xlib_init_with_depth (Display *display,
+				 int screen_num, int prefDepth)
+{
+    xlib_rgb_init_with_depth (display, ScreenOfDisplay (display, screen_num),
+			      prefDepth);
+    gdk_pixbuf_dpy = display;
+    gdk_pixbuf_screen = screen_num;
+}

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h

@@ -0,0 +1,87 @@
+/* GdkPixbuf library - Xlib header file
+ *
+ * Authors: John Harper <john@dcs.warwick.ac.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef GDK_PIXBUF_XLIB_H
+#define GDK_PIXBUF_XLIB_H
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
+
+G_BEGIN_DECLS
+
+#include <X11/Xlib.h>
+
+
+
+/* init */
+
+void gdk_pixbuf_xlib_init (Display *display, int screen_num);
+
+void gdk_pixbuf_xlib_init_with_depth (Display *display, int screen_num,
+				      int prefDepth);
+
+
+
+/* render */
+
+void gdk_pixbuf_xlib_render_threshold_alpha (GdkPixbuf *pixbuf, Pixmap bitmap,
+					     int src_x, int src_y,
+					     int dest_x, int dest_y,
+					     int width, int height,
+					     int alpha_threshold);
+
+void gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf,
+					 Drawable drawable, GC gc,
+					 int src_x, int src_y,
+					 int dest_x, int dest_y,
+					 int width, int height,
+					 XlibRgbDither dither,
+					 int x_dither, int y_dither);
+
+
+void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
+					       Drawable drawable,
+					       int src_x, int src_y,
+					       int dest_x, int dest_y,
+					       int width, int height,
+					       GdkPixbufAlphaMode alpha_mode,
+					       int alpha_threshold,
+					       XlibRgbDither dither,
+					       int x_dither, int y_dither);
+
+void gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf,
+					     Pixmap *pixmap_return,
+					     Pixmap *mask_return,
+					     int alpha_threshold);
+
+
+
+/* drawable */
+
+GdkPixbuf *gdk_pixbuf_xlib_get_from_drawable (GdkPixbuf *dest,
+					      Drawable src,
+					      Colormap cmap, Visual *visual,
+					      int src_x, int src_y,
+					      int dest_x, int dest_y,
+					      int width, int height);
+
+G_END_DECLS
+
+#endif /* GDK_PIXBUF_XLIB_H */

contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h

@@ -0,0 +1,188 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "MPL"); you may not use this file except in
+ * compliance with the MPL.  You may obtain a copy of the MPL at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the MPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the MPL
+ * for the specific language governing rights and limitations under the
+ * MPL.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU Library General Public License (the "LGPL"), in
+ * which case the provisions of the LGPL are applicable instead of
+ * those above.  If you wish to allow use of your version of this file
+ * only under the terms of the LGPL and not to allow others to use
+ * your version of this file under the MPL, indicate your decision by
+ * deleting the provisions above and replace them with the notice and
+ * other provisions required by the LGPL.  If you do not delete the
+ * provisions above, a recipient may use your version of this file
+ * under either the MPL or the LGPL.
+ */
+
+/*
+ * This code is derived from GdkRgb.
+ * For more information on GdkRgb, see http://www.levien.com/gdkrgb/
+ * Raph Levien <raph@acm.org>
+ */
+
+/* Ported by Christopher Blizzard to Xlib.  With permission from the
+ * original authors of this file, the contents of this file are also
+ * redistributable under the terms of the Mozilla Public license.  For
+ * information about the Mozilla Public License, please see the
+ * license information at http://www.mozilla.org/MPL/
+ */
+
+/* This code is copyright the following authors:
+ * Raph Levien          <raph@acm.org>
+ * Manish Singh         <manish@gtk.org>
+ * Tim Janik            <timj@gtk.org>
+ * Peter Mattis         <petm@xcf.berkeley.edu>
+ * Spencer Kimball      <spencer@xcf.berkeley.edu>
+ * Josh MacDonald       <jmacd@xcf.berkeley.edu>
+ * Christopher Blizzard <blizzard@redhat.com>
+ * Owen Taylor          <otaylor@redhat.com>
+ * Shawn T. Amundson    <amundson@gtk.org>
+*/
+
+
+#ifndef __XLIB_RGB_H__
+#define __XLIB_RGB_H__
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+typedef struct _XlibRgbCmap XlibRgbCmap;
+
+struct _XlibRgbCmap {
+  unsigned int colors[256];
+  unsigned char lut[256]; /* for 8-bit modes */
+};
+
+void
+xlib_rgb_init (Display *display, Screen *screen);
+void
+xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth);
+
+unsigned long
+xlib_rgb_xpixel_from_rgb (guint32 rgb);
+
+void
+xlib_rgb_gc_set_foreground (GC gc, guint32 rgb);
+
+void
+xlib_rgb_gc_set_background (GC gc, guint32 rgb);
+
+typedef enum
+{
+  XLIB_RGB_DITHER_NONE,
+  XLIB_RGB_DITHER_NORMAL,
+  XLIB_RGB_DITHER_MAX
+} XlibRgbDither;
+
+void
+xlib_draw_rgb_image (Drawable drawable,
+		     GC gc,
+		     int x,
+		     int y,
+		     int width,
+		     int height,
+		     XlibRgbDither dith,
+		     unsigned char *rgb_buf,
+		     int rowstride);
+
+void
+xlib_draw_rgb_image_dithalign (Drawable drawable,
+			       GC gc,
+			       int x,
+			       int y,
+			       int width,
+			       int height,
+			       XlibRgbDither dith,
+			       unsigned char *rgb_buf,
+			       int rowstride,
+			       int xdith,
+			       int ydith);
+
+void
+xlib_draw_rgb_32_image (Drawable drawable,
+			GC gc,
+			int x,
+			int y,
+			int width,
+			int height,
+			XlibRgbDither dith,
+			unsigned char *buf,
+			int rowstride);
+
+void
+xlib_draw_gray_image (Drawable drawable,
+		      GC gc,
+		      int x,
+		      int y,
+		      int width,
+		      int height,
+		      XlibRgbDither dith,
+		      unsigned char *buf,
+		      int rowstride);
+
+XlibRgbCmap *
+xlib_rgb_cmap_new (guint32 *colors, int n_colors);
+
+void
+xlib_rgb_cmap_free (XlibRgbCmap *cmap);
+
+void
+xlib_draw_indexed_image (Drawable drawable,
+                         GC gc,
+                         int x,
+                         int y,
+                         int width,
+                         int height,
+                         XlibRgbDither dith,
+                         unsigned char *buf,
+                         int rowstride,
+                         XlibRgbCmap *cmap);
+
+/* Below are some functions which are primarily useful for debugging
+   and experimentation. */
+Bool
+xlib_rgb_ditherable (void);
+
+void
+xlib_rgb_set_verbose (Bool verbose);
+
+/* experimental colormap stuff */
+void
+xlib_rgb_set_install (Bool install);
+
+void
+xlib_rgb_set_min_colors (int min_colors);
+
+Colormap
+xlib_rgb_get_cmap (void);
+
+Visual *
+xlib_rgb_get_visual (void);
+
+XVisualInfo *
+xlib_rgb_get_visual_info (void);
+
+int
+xlib_rgb_get_depth (void);
+
+Display *
+xlib_rgb_get_display (void);
+
+Screen *
+xlib_rgb_get_screen (void);
+
+G_END_DECLS
+
+#endif /* __XLIB_RGB_H__ */

demos/Makefile.am

@@ -12,36 +12,60 @@ INCLUDES = 				\
 	$(GTK_DEP_CFLAGS)
 
 DEPS = 									\
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
 	$(top_builddir)/gdk/$(gdktargetlib) 				\
 	$(top_builddir)/gtk/$(gtktargetlib)
 
 LDADDS = 								\
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
 	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)				\
-	$(GTK_DEP_LIBS)							\
-	$(MATH_LIB)
+	$(top_builddir)/gtk/$(gtktargetlib)
 
 noinst_PROGRAMS = 		\
+	testpixbuf-drawable 	\
 	testanimation 		\
-	testpixbuf-color	\
 	testpixbuf-save		\
 	testpixbuf-scale 	\
 	pixbuf-demo
 
+# Need to build test-inline-pixbufs.h for testpixbuf
+if HAVE_PNG
+noinst_PROGRAMS += testpixbuf
+BUILT_SOURCES = test-inline-pixbufs.h
+endif
+
+if CROSS_COMPILING
+pixbuf_csource=$(GDK_PIXBUF_CSOURCE)
+pixbuf_csource_deps=
+else
+pixbuf_csource=GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
+pixbuf_csource_deps=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders 
+endif
+
+test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png
+	$(pixbuf_csource) --raw --build-list		\
+	        apple_red  $(srcdir)/apple-red.png	\
+                gnome_foot $(srcdir)/gnome-foot.png	\
+        > test-inline-pixbufs.h				\
+	|| (rm -f test-inline-pixbufs.h && false)
+
+testpixbuf_DEPENDENCIES = $(DEPS)
+testpixbuf_drawable_DEPENDENCIES = $(DEPS)
 testpixbuf_save_DEPENDENCIES = $(DEPS)
-testpixbuf_color_DEPENDENCIES = $(DEPS)
 testpixbuf_scale_DEPENDENCIES = $(DEPS)
 testanimation_DEPENDENCIES = $(DEPS)
 pixbuf_demo_DEPENDENCIES = $(DEPS)
 
+testpixbuf_LDADD = $(LDADDS)
+testpixbuf_drawable_LDADD = $(LDADDS)
 testpixbuf_save_LDADD = $(LDADDS)
-testpixbuf_color_LDADD = $(LDADDS)
 testpixbuf_scale_LDADD = $(LDADDS)
 testanimation_LDADD = $(LDADDS)
 pixbuf_demo_LDADD = $(LDADDS)
 
+testpixbuf_SOURCES = testpixbuf.c pixbuf-init.c
+testpixbuf_drawable_SOURCES = testpixbuf-drawable.c pixbuf-init.c
 testpixbuf_save_SOURCES = testpixbuf-save.c
-testpixbuf_color_SOURCES = testpixbuf-color.c
 testpixbuf_scale_SOURCES = testpixbuf-scale.c pixbuf-init.c
 testanimation_SOURCES = testanimation.c pixbuf-init.c
 pixbuf_demo_SOURCES = pixbuf-demo.c pixbuf-init.c
@@ -57,4 +81,6 @@ EXTRA_DIST +=			\
 	gnome-gsame.png		\
 	gnu-keys.png
 
+DISTCLEANFILES = test-inline-pixbufs.h
+
 -include $(top_srcdir)/git.mk

demos/gtk-demo/Makefile.am

@@ -1,7 +1,7 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl
 
-democodedir=$(datadir)/gtk-$(GTK_API_VERSION)/demo
+democodedir=$(datadir)/gtk-2.0/demo
 
 ## These should be in the order you want them to appear in the
 ## demo app, which means alphabetized by demo title, not filename
@@ -37,11 +37,9 @@ demos =						\
 	rotated_text.c				\
 	search_entry.c				\
 	sizegroup.c				\
-	spinner.c				\
 	stock_browser.c				\
 	textview.c				\
 	textscroll.c				\
-	toolpalette.c				\
 	tree_store.c				\
 	ui_manager.c
 
@@ -55,16 +53,16 @@ INCLUDES = \
 	$(GTK_DEP_CFLAGS)
 
 DEPS = \
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
 	$(top_builddir)/gdk/$(gdktargetlib) 				\
 	$(top_builddir)/gtk/$(gtktargetlib)
 
 LDADDS = \
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
 	$(top_builddir)/gdk/$(gdktargetlib)        			\
-	$(top_builddir)/gtk/$(gtktargetlib)				\
-	$(GTK_DEP_LIBS)							\
-	-lm
+	$(top_builddir)/gtk/$(gtktargetlib)
 
-bin_PROGRAMS = gtk3-demo
+bin_PROGRAMS = gtk-demo
 
 BUILT_SOURCES = demos.h
 
@@ -75,15 +73,15 @@ EXTRA_DIST += 		\
 demos.h: @REBUILD@ $(demos) geninclude.pl
 	(here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
 
-gtk3_demo_SOURCES = 		\
+gtk_demo_SOURCES = 		\
 	$(demos)		\
 	demo-common.h		\
 	main.c			\
 	demos.h
 
-gtk3_demo_DEPENDENCIES = $(DEPS)
-gtk3_demo_LDADD = $(LDADDS)
-gtk3_demo_LDFLAGS = -export-dynamic
+gtk_demo_DEPENDENCIES = $(DEPS)
+gtk_demo_LDADD = $(LDADDS)
+gtk_demo_LDFLAGS = -export-dynamic
 
 IMAGEFILES=	alphatest.png		\
 	        apple-red.png		\
@@ -98,7 +96,7 @@ IMAGEFILES=	alphatest.png		\
 		gnome-gmush.png		\
 		gnome-gsame.png		\
 		gnu-keys.png		\
-		gtk-logo-rgb.gif
+		gtk-logo-rgb.gif		
 
 democode_DATA = $(demos) $(IMAGEFILES) demo.ui
 

demos/gtk-demo/appwindow.c

@@ -19,16 +19,6 @@ activate_action (GtkAction *action)
 
   GtkWidget *dialog;
 
-  if (g_str_equal (name, "DarkTheme"))
-    {
-      gboolean value = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
-      GtkSettings *settings = gtk_settings_get_default ();
-
-      g_object_set (G_OBJECT (settings),
-		    "gtk-application-prefer-dark-theme", value,
-		    NULL);
-      return;
-    }
   dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                    GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_INFO,
@@ -109,6 +99,22 @@ about_cb (GtkAction *action,
     NULL
   };
 
+  const gchar *license =
+    "This library is free software; you can redistribute it and/or\n"
+    "modify it under the terms of the GNU Library General Public License as\n"
+    "published by the Free Software Foundation; either version 2 of the\n"
+    "License, or (at your option) any later version.\n"
+    "\n"
+    "This library is distributed in the hope that it will be useful,\n"
+    "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
+    "Library General Public License for more details.\n"
+    "\n"
+    "You should have received a copy of the GNU Library General Public\n"
+    "License along with the Gnome Library; see the file COPYING.LIB.  If not,\n"
+    "write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
+    "Boston, MA 02111-1307, USA.\n";
+
   pixbuf = NULL;
   transparent = NULL;
   filename = demo_find_file ("gtk-logo-rgb.gif", NULL);
@@ -126,7 +132,7 @@ about_cb (GtkAction *action,
 			 "program-name", "GTK+ Code Demos",
 			 "version", PACKAGE_VERSION,
 			 "copyright", "(C) 1997-2009 The GTK+ Team",
-			 "license-type", GTK_LICENSE_LGPL_2_1,
+			 "license", license,
 			 "website", "http://www.gtk.org",
 			 "comments", "Program to demonstrate GTK+ functions.",
 			 "authors", authors,
@@ -206,11 +212,6 @@ static GtkToggleActionEntry toggle_entries[] = {
     "Bold",                                    /* tooltip */
     G_CALLBACK (activate_action),
     TRUE },                                    /* is_active */
-  { "DarkTheme", NULL,                         /* name, stock id */
-     "_Prefer Dark Theme", NULL,               /* label, accelerator */
-    "Prefer Dark Theme",                       /* tooltip */
-    G_CALLBACK (activate_action),
-    FALSE },                                   /* is_active */
 };
 static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);
 
@@ -264,7 +265,6 @@ static const gchar *ui_info =
 "      <menuitem action='Quit'/>"
 "    </menu>"
 "    <menu action='PreferencesMenu'>"
-"      <menuitem action='DarkTheme'/>"
 "      <menu action='ColorMenu'>"
 "	<menuitem action='Red'/>"
 "	<menuitem action='Green'/>"
@@ -443,7 +443,7 @@ do_appwindow (GtkWidget *do_widget)
       gtk_window_set_screen (GTK_WINDOW (window),
 			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Application Window");
-      gtk_window_set_icon_name (GTK_WINDOW (window), "document-open");
+      gtk_window_set_icon_name (GTK_WINDOW (window), "gtk-open");
 
       /* NULL window variable when window is closed */
       g_signal_connect (window, "destroy",
@@ -595,7 +595,7 @@ do_appwindow (GtkWidget *do_widget)
       update_statusbar (buffer, GTK_STATUSBAR (statusbar));
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/assistant.c

@@ -9,35 +9,12 @@
 #include "demo-common.h"
 
 static GtkWidget *assistant = NULL;
-static GtkWidget *progress_bar = NULL;
-
-static gboolean
-apply_changes_gradually (gpointer data)
-{
-  gdouble fraction;
-
-  /* Work, work, work... */
-  fraction = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (progress_bar));
-  fraction += 0.05;
-
-  if (fraction < 1.0)
-    {
-      gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress_bar), fraction);
-      return TRUE;
-    }
-  else
-    {
-      /* Close automatically once changes are fully applied. */
-      gtk_widget_destroy (assistant);
-      return FALSE;
-    }
-}
 
 static void
 on_assistant_apply (GtkWidget *widget, gpointer data)
 {
-  /* Start a timer to simulate changes taking a few seconds to apply. */
-  g_timeout_add (100, apply_changes_gradually, NULL);
+  /* Apply here changes, this is a fictional
+     example, so we just do nothing here */
 }
 
 static void
@@ -61,13 +38,6 @@ on_assistant_prepare (GtkWidget *widget, GtkWidget *page, gpointer data)
   title = g_strdup_printf ("Sample assistant (%d of %d)", current_page + 1, n_pages);
   gtk_window_set_title (GTK_WINDOW (widget), title);
   g_free (title);
-
-  /* The fourth page (counting from zero) is the progress page.  The
-  * user clicked Apply to get here so we tell the assistant to commit,
-  * which means the changes up to this point are permanent and cannot
-  * be cancelled or revisited. */
-  if (current_page == 3)
-      gtk_assistant_commit (GTK_ASSISTANT (widget));
 }
 
 static void
@@ -157,26 +127,6 @@ create_page3 (GtkWidget *assistant)
   g_object_unref (pixbuf);
 }
 
-static void
-create_page4 (GtkWidget *assistant)
-{
-  GtkWidget *page;
-
-  page = gtk_alignment_new (0.5, 0.5, 0.5, 0.0);
-
-  progress_bar = gtk_progress_bar_new ();
-  gtk_container_add (GTK_CONTAINER (page), progress_bar);
-
-  gtk_widget_show_all (page);
-  gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
-  gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), page, GTK_ASSISTANT_PAGE_PROGRESS);
-  gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Applying changes");
-
-  /* This prevents the assistant window from being
-   * closed while we're "busy" applying changes. */
-  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, FALSE);
-}
-
 GtkWidget*
 do_assistant (GtkWidget *do_widget)
 {
@@ -192,7 +142,6 @@ do_assistant (GtkWidget *do_widget)
       create_page1 (assistant);
       create_page2 (assistant);
       create_page3 (assistant);
-      create_page4 (assistant);
 
       g_signal_connect (G_OBJECT (assistant), "cancel",
 			G_CALLBACK (on_assistant_close_cancel), &assistant);
@@ -204,7 +153,7 @@ do_assistant (GtkWidget *do_widget)
 			G_CALLBACK (on_assistant_prepare), NULL);
     }
 
-  if (!gtk_widget_get_visible (assistant))
+  if (!GTK_WIDGET_VISIBLE (assistant))
     gtk_widget_show (assistant);
   else
     {

demos/gtk-demo/builder.c

@@ -53,7 +53,7 @@ do_builder (GtkWidget *do_widget)
 			G_CALLBACK (gtk_widget_destroyed), &window);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/button_box.c

@@ -113,7 +113,7 @@ do_button_box (GtkWidget *do_widget)
 			TRUE, TRUE, 5);
   }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/changedisplay.c

@@ -128,7 +128,7 @@ query_for_toplevel (GdkScreen  *screen,
   gtk_widget_show_all (popup);
   cursor = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
 
-  if (gdk_pointer_grab (gtk_widget_get_window (popup), FALSE,
+  if (gdk_pointer_grab (popup->window, FALSE,
 			GDK_BUTTON_RELEASE_MASK,
 			NULL,
 			cursor,
@@ -229,7 +229,6 @@ static void
 open_display_cb (GtkWidget         *button,
 		 ChangeDisplayInfo *info)
 {
-  GtkWidget *content_area;
   GtkWidget *dialog;
   GtkWidget *display_entry;
   GtkWidget *dialog_label;
@@ -249,13 +248,11 @@ open_display_cb (GtkWidget         *button,
   dialog_label =
     gtk_label_new ("Please enter the name of\nthe new display\n");
 
-  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-
-  gtk_container_add (GTK_CONTAINER (content_area), dialog_label);
-  gtk_container_add (GTK_CONTAINER (content_area), display_entry);
+  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), dialog_label);
+  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), display_entry);
 
   gtk_widget_grab_focus (display_entry);
-  gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (dialog)));
+  gtk_widget_show_all (GTK_BIN (dialog)->child);
 
   while (!result)
     {
@@ -602,7 +599,6 @@ do_changedisplay (GtkWidget *do_widget)
 
   if (!info)
     {
-      GtkWidget *content_area;
       GtkWidget *vbox;
       GtkWidget *frame;
 
@@ -622,11 +618,11 @@ do_changedisplay (GtkWidget *do_widget)
       g_signal_connect (info->window, "destroy",
 			G_CALLBACK (destroy_cb), &info);
 
-      content_area = gtk_dialog_get_content_area (GTK_DIALOG (info->window));
-
       vbox = gtk_vbox_new (FALSE, 5);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+
+      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (info->window)->vbox), vbox,
+			  TRUE, TRUE, 0);
 
       frame = create_display_frame (info);
       gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);

demos/gtk-demo/clipboard.c

@@ -314,7 +314,7 @@ do_clipboard (GtkWidget *do_widget)
       gtk_clipboard_set_can_store (clipboard, NULL, 0);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/colorsel.c

@@ -19,23 +19,17 @@ expose_event_callback (GtkWidget      *widget,
                        GdkEventExpose *event, 
                        gpointer        data)
 {
-  GdkWindow *window;
-
-  window = gtk_widget_get_window (widget);
-  if (window)
+  if (widget->window)
     {
       GtkStyle *style;
-      cairo_t *cr;
 
       style = gtk_widget_get_style (widget);
 
-      cr = gdk_cairo_create (window);
-
-      gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
-      gdk_cairo_rectangle (cr, &event->area);
-      cairo_fill (cr);
-
-      cairo_destroy (cr);
+      gdk_draw_rectangle (widget->window,
+                          style->bg_gc[GTK_STATE_NORMAL],
+                          TRUE,
+                          event->area.x, event->area.y,
+                          event->area.width, event->area.height);
     }
 
   return TRUE;
@@ -47,15 +41,13 @@ change_color_callback (GtkWidget *button,
 {
   GtkWidget *dialog;
   GtkColorSelection *colorsel;
-  GtkColorSelectionDialog *selection_dialog;
   gint response;
   
   dialog = gtk_color_selection_dialog_new ("Changing color");
 
   gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
-
-  selection_dialog = GTK_COLOR_SELECTION_DIALOG (dialog);
-  colorsel = GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (selection_dialog));
+  
+  colorsel = GTK_COLOR_SELECTION (GTK_COLOR_SELECTION_DIALOG (dialog)->colorsel);
 
   gtk_color_selection_set_previous_color (colorsel, &color);
   gtk_color_selection_set_current_color (colorsel, &color);
@@ -133,7 +125,7 @@ do_colorsel (GtkWidget *do_widget)
 			G_CALLBACK (change_color_callback), NULL);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/combobox.c

@@ -435,12 +435,12 @@ do_combobox (GtkWidget *do_widget)
     entry = g_object_new (TYPE_MASK_ENTRY, NULL);
     MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$";
      
-    gtk_container_remove (GTK_CONTAINER (combo), gtk_bin_get_child (GTK_BIN (combo)));
+    gtk_container_remove (GTK_CONTAINER (combo), GTK_BIN (combo)->child);
     gtk_container_add (GTK_CONTAINER (combo), entry);
   
   }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/dialog.c

@@ -33,7 +33,6 @@ static void
 interactive_dialog_clicked (GtkButton *button,
 			    gpointer   user_data)
 {
-  GtkWidget *content_area;
   GtkWidget *dialog;
   GtkWidget *hbox;
   GtkWidget *stock;
@@ -52,11 +51,9 @@ interactive_dialog_clicked (GtkButton *button,
                                         GTK_RESPONSE_CANCEL,
 					NULL);
 
-  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-
   hbox = gtk_hbox_new (FALSE, 8);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
-  gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);
 
   stock = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
   gtk_box_pack_start (GTK_BOX (hbox), stock, FALSE, FALSE, 0);
@@ -170,7 +167,7 @@ do_dialog (GtkWidget *do_widget)
       gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry2);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/drawingarea.c

@@ -17,53 +17,52 @@
 
 static GtkWidget *window = NULL;
 /* Pixmap for scribble area, to store current scribbles */
-static cairo_surface_t *surface = NULL;
+static GdkPixmap *pixmap = NULL;
 
-/* Create a new surface of the appropriate size to store our scribbles */
+/* Create a new pixmap of the appropriate size to store our scribbles */
 static gboolean
 scribble_configure_event (GtkWidget         *widget,
                           GdkEventConfigure *event,
                           gpointer           data)
 {
-  GtkAllocation allocation;
-  cairo_t *cr;
+  if (pixmap)
+    g_object_unref (pixmap);
 
-  if (surface)
-    cairo_surface_destroy (surface);
+  pixmap = gdk_pixmap_new (widget->window,
+                           widget->allocation.width,
+                           widget->allocation.height,
+                           -1);
 
-  gtk_widget_get_allocation (widget, &allocation);
-  surface = gdk_window_create_similar_surface (gtk_widget_get_window (widget),
-                                               CAIRO_CONTENT_COLOR,
-                                               allocation.width,
-                                               allocation.height);
-
-  /* Initialize the surface to white */
-  cr = cairo_create (surface);
-
-  cairo_set_source_rgb (cr, 1, 1, 1);
-  cairo_paint (cr);
-
-  cairo_destroy (cr);
+  /* Initialize the pixmap to white */
+  gdk_draw_rectangle (pixmap,
+                      widget->style->white_gc,
+                      TRUE,
+                      0, 0,
+                      widget->allocation.width,
+                      widget->allocation.height);
 
   /* We've handled the configure event, no need for further processing. */
   return TRUE;
 }
 
-/* Redraw the screen from the surface */
+/* Redraw the screen from the pixmap */
 static gboolean
 scribble_expose_event (GtkWidget      *widget,
                        GdkEventExpose *event,
                        gpointer        data)
 {
-  cairo_t *cr;
+  /* We use the "foreground GC" for the widget since it already exists,
+   * but honestly any GC would work. The only thing to worry about
+   * is whether the GC has an inappropriate clip region set.
+   */
 
-  cr = gdk_cairo_create (gtk_widget_get_window (widget));
-  
-  cairo_set_source_surface (cr, surface, 0, 0);
-  gdk_cairo_rectangle (cr, &event->area);
-  cairo_fill (cr);
-
-  cairo_destroy (cr);
+  gdk_draw_drawable (widget->window,
+                     widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+                     pixmap,
+                     /* Only copy the area that was exposed. */
+                     event->area.x, event->area.y,
+                     event->area.x, event->area.y,
+                     event->area.width, event->area.height);
 
   return FALSE;
 }
@@ -75,23 +74,21 @@ draw_brush (GtkWidget *widget,
             gdouble    y)
 {
   GdkRectangle update_rect;
-  cairo_t *cr;
 
   update_rect.x = x - 3;
   update_rect.y = y - 3;
   update_rect.width = 6;
   update_rect.height = 6;
 
-  /* Paint to the surface, where we store our state */
-  cr = cairo_create (surface);
-
-  gdk_cairo_rectangle (cr, &update_rect);
-  cairo_fill (cr);
-
-  cairo_destroy (cr);
+  /* Paint to the pixmap, where we store our state */
+  gdk_draw_rectangle (pixmap,
+                      widget->style->black_gc,
+                      TRUE,
+                      update_rect.x, update_rect.y,
+                      update_rect.width, update_rect.height);
 
   /* Now invalidate the affected region of the drawing area. */
-  gdk_window_invalidate_rect (gtk_widget_get_window (widget),
+  gdk_window_invalidate_rect (widget->window,
                               &update_rect,
                               FALSE);
 }
@@ -101,7 +98,7 @@ scribble_button_press_event (GtkWidget      *widget,
                              GdkEventButton *event,
                              gpointer        data)
 {
-  if (surface == NULL)
+  if (pixmap == NULL)
     return FALSE; /* paranoia check, in case we haven't gotten a configure event */
 
   if (event->button == 1)
@@ -119,7 +116,7 @@ scribble_motion_notify_event (GtkWidget      *widget,
   int x, y;
   GdkModifierType state;
 
-  if (surface == NULL)
+  if (pixmap == NULL)
     return FALSE; /* paranoia check, in case we haven't gotten a configure event */
 
   /* This call is very important; it requests the next motion event.
@@ -148,9 +145,9 @@ checkerboard_expose (GtkWidget      *da,
                      GdkEventExpose *event,
                      gpointer        data)
 {
-  GtkAllocation allocation;
   gint i, j, xcount, ycount;
-  cairo_t *cr;
+  GdkGC *gc1, *gc2;
+  GdkColor color;
 
 #define CHECK_SIZE 10
 #define SPACING 2
@@ -162,30 +159,47 @@ checkerboard_expose (GtkWidget      *da,
    * works.
    */
 
-  cr = gdk_cairo_create (gtk_widget_get_window (da));
-  gdk_cairo_rectangle (cr, &event->area);
-  cairo_clip (cr);
+  /* It would be a bit more efficient to keep these
+   * GC's around instead of recreating on each expose, but
+   * this is the lazy/slow way.
+   */
+  gc1 = gdk_gc_new (da->window);
+  color.red = 30000;
+  color.green = 0;
+  color.blue = 30000;
+  gdk_gc_set_rgb_fg_color (gc1, &color);
+
+  gc2 = gdk_gc_new (da->window);
+  color.red = 65535;
+  color.green = 65535;
+  color.blue = 65535;
+  gdk_gc_set_rgb_fg_color (gc2, &color);
 
-  gtk_widget_get_allocation (da, &allocation);
   xcount = 0;
   i = SPACING;
-  while (i < allocation.width)
+  while (i < da->allocation.width)
     {
       j = SPACING;
       ycount = xcount % 2; /* start with even/odd depending on row */
-      while (j < allocation.height)
+      while (j < da->allocation.height)
         {
+          GdkGC *gc;
+
           if (ycount % 2)
-            cairo_set_source_rgb (cr, 0.45777, 0, 0.45777);
+            gc = gc1;
           else
-            cairo_set_source_rgb (cr, 1, 1, 1);
+            gc = gc2;
 
           /* If we're outside event->area, this will do nothing.
            * It might be mildly more efficient if we handled
            * the clipping ourselves, but again we're feeling lazy.
            */
-          cairo_rectangle (cr, i, j, CHECK_SIZE, CHECK_SIZE);
-          cairo_fill (cr);
+          gdk_draw_rectangle (da->window,
+                              gc,
+                              TRUE,
+                              i, j,
+                              CHECK_SIZE,
+                              CHECK_SIZE);
 
           j += CHECK_SIZE + SPACING;
           ++ycount;
@@ -195,7 +209,8 @@ checkerboard_expose (GtkWidget      *da,
       ++xcount;
     }
 
-  cairo_destroy (cr);
+  g_object_unref (gc1);
+  g_object_unref (gc2);
 
   /* return TRUE because we've handled this event, so no
    * further processing is required.
@@ -208,9 +223,9 @@ close_window (void)
 {
   window = NULL;
 
-  if (surface)
-    g_object_unref (surface);
-  surface = NULL;
+  if (pixmap)
+    g_object_unref (pixmap);
+  pixmap = NULL;
 }
 
 GtkWidget *
@@ -277,7 +292,7 @@ do_drawingarea (GtkWidget *do_widget)
 
       gtk_container_add (GTK_CONTAINER (frame), da);
 
-      /* Signals used to handle backing surface */
+      /* Signals used to handle backing pixmap */
 
       g_signal_connect (da, "expose-event",
                         G_CALLBACK (scribble_expose_event), NULL);
@@ -303,7 +318,7 @@ do_drawingarea (GtkWidget *do_widget)
 
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
       gtk_widget_show_all (window);
   else
       gtk_widget_destroy (window);

demos/gtk-demo/editable_cells.c

@@ -381,7 +381,7 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/entry_buffer.c

@@ -11,7 +11,6 @@ static GtkWidget *window = NULL;
 GtkWidget *
 do_entry_buffer (GtkWidget *do_widget)
 {
-  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *label;
   GtkWidget *entry;
@@ -32,10 +31,8 @@ do_entry_buffer (GtkWidget *do_widget)
     g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_widget_destroyed), &window);
 
-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
     vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     label = gtk_label_new (NULL);
@@ -57,7 +54,7 @@ do_entry_buffer (GtkWidget *do_widget)
     g_object_unref (buffer);
   }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/entry_completion.c

@@ -37,7 +37,6 @@ create_completion_model (void)
 GtkWidget *
 do_entry_completion (GtkWidget *do_widget)
 {
-  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *label;
   GtkWidget *entry;
@@ -59,10 +58,8 @@ do_entry_completion (GtkWidget *do_widget)
     g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_widget_destroyed), &window);
 
-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
     vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     label = gtk_label_new (NULL);
@@ -89,7 +86,7 @@ do_entry_completion (GtkWidget *do_widget)
     gtk_entry_completion_set_text_column (completion, 0);
   }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/expander.c

@@ -13,7 +13,6 @@ static GtkWidget *window = NULL;
 GtkWidget *
 do_expander (GtkWidget *do_widget)
 {
-  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *label;
   GtkWidget *expander;
@@ -33,10 +32,8 @@ do_expander (GtkWidget *do_widget)
     g_signal_connect (window, "destroy",
 		      G_CALLBACK (gtk_widget_destroyed), &window);
 
-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
     vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
     label = gtk_label_new ("Expander demo. Click on the triangle for details.");
@@ -50,7 +47,7 @@ do_expander (GtkWidget *do_widget)
     gtk_container_add (GTK_CONTAINER (expander), label);
   }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/hypertext.c

@@ -225,8 +225,7 @@ motion_notify_event (GtkWidget      *text_view,
 
   set_cursor_if_appropriate (GTK_TEXT_VIEW (text_view), x, y);
 
-  gdk_window_get_pointer (gtk_widget_get_window (text_view),
-                          NULL, NULL, NULL);
+  gdk_window_get_pointer (text_view->window, NULL, NULL, NULL);
   return FALSE;
 }
 
@@ -238,10 +237,9 @@ visibility_notify_event (GtkWidget          *text_view,
                          GdkEventVisibility *event)
 {
   gint wx, wy, bx, by;
-
-  gdk_window_get_pointer (gtk_widget_get_window (text_view),
-                          &wx, &wy, NULL);
-
+  
+  gdk_window_get_pointer (text_view->window, &wx, &wy, NULL);
+  
   gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (text_view), 
                                          GTK_TEXT_WINDOW_WIDGET,
                                          wx, wy, &bx, &by);
@@ -302,7 +300,7 @@ do_hypertext (GtkWidget *do_widget)
       gtk_widget_show_all (sw);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/iconview.c

@@ -358,7 +358,7 @@ do_iconview (GtkWidget *do_widget)
 	}
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/iconview_edit.c

@@ -146,7 +146,7 @@ do_iconview_edit (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (window), icon_view);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/images.c

@@ -317,7 +317,6 @@ do_images (GtkWidget *do_widget)
   GtkWidget *align;
   GtkWidget *button;
   GdkPixbuf *pixbuf;
-  GIcon     *gicon;
   GError *error = NULL;
   char *filename;
 
@@ -416,26 +415,6 @@ do_images (GtkWidget *do_widget)
 
       gtk_container_add (GTK_CONTAINER (frame), image);
 
-      /* Symbolic icon */
-
-      label = gtk_label_new (NULL);
-      gtk_label_set_markup (GTK_LABEL (label),
-			    "<u>Symbolic themed icon</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
-      frame = gtk_frame_new (NULL);
-      gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      /* The alignment keeps the frame from growing when users resize
-       * the window
-       */
-      align = gtk_alignment_new (0.5, 0.5, 0, 0);
-      gtk_container_add (GTK_CONTAINER (align), frame);
-      gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
-
-      gicon = g_themed_icon_new_with_default_fallbacks ("battery-critical-charging-symbolic");
-      image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);
-
-      gtk_container_add (GTK_CONTAINER (frame), image);
 
       /* Progressive */
 
@@ -471,7 +450,7 @@ do_images (GtkWidget *do_widget)
                         vbox);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/infobar.c

@@ -90,7 +90,7 @@ do_infobar (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/links.c

@@ -70,7 +70,7 @@ do_links (GtkWidget *do_widget)
       gtk_widget_show (label);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/list_store.c

@@ -10,8 +10,6 @@
 #include <gtk/gtk.h>
 
 static GtkWidget *window = NULL;
-static GtkTreeModel *model = NULL;
-static guint timeout = 0;
 
 typedef struct
 {
@@ -28,10 +26,6 @@ enum
   COLUMN_NUMBER,
   COLUMN_SEVERITY,
   COLUMN_DESCRIPTION,
-  COLUMN_PULSE,
-  COLUMN_ICON,
-  COLUMN_ACTIVE,
-  COLUMN_SENSITIVE,
   NUM_COLUMNS
 };
 
@@ -53,33 +47,6 @@ static Bug data[] =
   { FALSE, 1,     "Normal",     "First bug :=)" },
 };
 
-static gboolean
-spinner_timeout (gpointer data)
-{
-  GtkTreeIter iter;
-  guint pulse;
-
-  if (model == NULL)
-    return FALSE;
-
-  gtk_tree_model_get_iter_first (model, &iter);
-  gtk_tree_model_get (model, &iter,
-                      COLUMN_PULSE, &pulse,
-                      -1);
-  if (pulse == G_MAXUINT)
-    pulse = 0;
-  else
-    pulse++;
-
-  gtk_list_store_set (GTK_LIST_STORE (model),
-                      &iter,
-                      COLUMN_PULSE, pulse,
-                      COLUMN_ACTIVE, TRUE,
-                      -1);
-
-  return TRUE;
-}
-
 static GtkTreeModel *
 create_model (void)
 {
@@ -89,40 +56,21 @@ create_model (void)
 
   /* create list store */
   store = gtk_list_store_new (NUM_COLUMNS,
-                              G_TYPE_BOOLEAN,
-                              G_TYPE_UINT,
-                              G_TYPE_STRING,
-                              G_TYPE_STRING,
-                              G_TYPE_UINT,
-                              G_TYPE_STRING,
-                              G_TYPE_BOOLEAN,
-                              G_TYPE_BOOLEAN);
+			      G_TYPE_BOOLEAN,
+			      G_TYPE_UINT,
+			      G_TYPE_STRING,
+			      G_TYPE_STRING);
 
   /* add data to the list store */
   for (i = 0; i < G_N_ELEMENTS (data); i++)
     {
-      gchar *icon_name;
-      gboolean sensitive;
-
-      if (i == 1 || i == 3)
-        icon_name = "battery-critical-charging-symbolic";
-      else
-        icon_name = NULL;
-      if (i == 3)
-        sensitive = FALSE;
-      else
-        sensitive = TRUE;
       gtk_list_store_append (store, &iter);
       gtk_list_store_set (store, &iter,
-                          COLUMN_FIXED, data[i].fixed,
-                          COLUMN_NUMBER, data[i].number,
-                          COLUMN_SEVERITY, data[i].severity,
-                          COLUMN_DESCRIPTION, data[i].description,
-                          COLUMN_PULSE, 0,
-                          COLUMN_ICON, icon_name,
-                          COLUMN_ACTIVE, FALSE,
-                          COLUMN_SENSITIVE, sensitive,
-                          -1);
+			  COLUMN_FIXED, data[i].fixed,
+			  COLUMN_NUMBER, data[i].number,
+			  COLUMN_SEVERITY, data[i].severity,
+			  COLUMN_DESCRIPTION, data[i].description,
+			  -1);
     }
 
   return GTK_TREE_MODEL (store);
@@ -130,8 +78,8 @@ create_model (void)
 
 static void
 fixed_toggled (GtkCellRendererToggle *cell,
-               gchar                 *path_str,
-               gpointer               data)
+	       gchar                 *path_str,
+	       gpointer               data)
 {
   GtkTreeModel *model = (GtkTreeModel *)data;
   GtkTreeIter  iter;
@@ -162,88 +110,48 @@ add_columns (GtkTreeView *treeview)
   /* column for fixed toggles */
   renderer = gtk_cell_renderer_toggle_new ();
   g_signal_connect (renderer, "toggled",
-                    G_CALLBACK (fixed_toggled), model);
+		    G_CALLBACK (fixed_toggled), model);
 
   column = gtk_tree_view_column_new_with_attributes ("Fixed?",
-                                                     renderer,
-                                                     "active", COLUMN_FIXED,
-                                                     NULL);
+						     renderer,
+						     "active", COLUMN_FIXED,
+						     NULL);
 
   /* set this column to a fixed sizing (of 50 pixels) */
   gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column),
-                                   GTK_TREE_VIEW_COLUMN_FIXED);
+				   GTK_TREE_VIEW_COLUMN_FIXED);
   gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), 50);
   gtk_tree_view_append_column (treeview, column);
 
   /* column for bug numbers */
   renderer = gtk_cell_renderer_text_new ();
   column = gtk_tree_view_column_new_with_attributes ("Bug number",
-                                                     renderer,
-                                                     "text",
-                                                     COLUMN_NUMBER,
-                                                     NULL);
+						     renderer,
+						     "text",
+						     COLUMN_NUMBER,
+						     NULL);
   gtk_tree_view_column_set_sort_column_id (column, COLUMN_NUMBER);
   gtk_tree_view_append_column (treeview, column);
 
   /* column for severities */
   renderer = gtk_cell_renderer_text_new ();
   column = gtk_tree_view_column_new_with_attributes ("Severity",
-                                                     renderer,
-                                                     "text",
-                                                     COLUMN_SEVERITY,
-                                                     NULL);
+						     renderer,
+						     "text",
+						     COLUMN_SEVERITY,
+						     NULL);
   gtk_tree_view_column_set_sort_column_id (column, COLUMN_SEVERITY);
   gtk_tree_view_append_column (treeview, column);
 
   /* column for description */
   renderer = gtk_cell_renderer_text_new ();
   column = gtk_tree_view_column_new_with_attributes ("Description",
-                                                     renderer,
-                                                     "text",
-                                                     COLUMN_DESCRIPTION,
-                                                     NULL);
+						     renderer,
+						     "text",
+						     COLUMN_DESCRIPTION,
+						     NULL);
   gtk_tree_view_column_set_sort_column_id (column, COLUMN_DESCRIPTION);
   gtk_tree_view_append_column (treeview, column);
-
-  /* column for spinner */
-  renderer = gtk_cell_renderer_spinner_new ();
-  column = gtk_tree_view_column_new_with_attributes ("Spinning",
-                                                     renderer,
-                                                     "pulse",
-                                                     COLUMN_PULSE,
-                                                     "active",
-                                                     COLUMN_ACTIVE,
-                                                     NULL);
-  gtk_tree_view_column_set_sort_column_id (column, COLUMN_PULSE);
-  gtk_tree_view_append_column (treeview, column);
-
-  /* column for symbolic icon */
-  renderer = gtk_cell_renderer_pixbuf_new ();
-  g_object_set (G_OBJECT (renderer), "follow-state", TRUE, NULL);
-  column = gtk_tree_view_column_new_with_attributes ("Symbolic icon",
-                                                     renderer,
-                                                     "icon-name",
-                                                     COLUMN_ICON,
-                                                     "sensitive",
-                                                     COLUMN_SENSITIVE,
-                                                     NULL);
-  gtk_tree_view_column_set_sort_column_id (column, COLUMN_ICON);
-  gtk_tree_view_append_column (treeview, column);
-}
-
-static gboolean
-window_closed (GtkWidget *widget,
-               GdkEvent  *event,
-               gpointer   user_data)
-{
-  model = NULL;
-  window = NULL;
-  if (timeout != 0)
-    {
-      g_source_remove (timeout);
-      timeout = 0;
-    }
-  return FALSE;
 }
 
 GtkWidget *
@@ -254,16 +162,17 @@ do_list_store (GtkWidget *do_widget)
       GtkWidget *vbox;
       GtkWidget *label;
       GtkWidget *sw;
+      GtkTreeModel *model;
       GtkWidget *treeview;
 
       /* create window, etc */
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
+			     gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "GtkListStore demo");
 
       g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
+			G_CALLBACK (gtk_widget_destroyed), &window);
       gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
       vbox = gtk_vbox_new (FALSE, 8);
@@ -274,10 +183,10 @@ do_list_store (GtkWidget *do_widget)
 
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
-                                           GTK_SHADOW_ETCHED_IN);
+					   GTK_SHADOW_ETCHED_IN);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_NEVER,
-                                      GTK_POLICY_AUTOMATIC);
+				      GTK_POLICY_NEVER,
+				      GTK_POLICY_AUTOMATIC);
       gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
 
       /* create tree model */
@@ -287,7 +196,7 @@ do_list_store (GtkWidget *do_widget)
       treeview = gtk_tree_view_new_with_model (model);
       gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
       gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview),
-                                       COLUMN_DESCRIPTION);
+				       COLUMN_DESCRIPTION);
 
       g_object_unref (model);
 
@@ -298,27 +207,14 @@ do_list_store (GtkWidget *do_widget)
 
       /* finish & show */
       gtk_window_set_default_size (GTK_WINDOW (window), 280, 250);
-      g_signal_connect (window, "delete-event",
-                        G_CALLBACK (window_closed), NULL);
     }
 
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-      if (timeout == 0) {
-        /* FIXME this should use the animation-duration instead */
-        timeout = g_timeout_add (80, spinner_timeout, NULL);
-      }
-    }
+  if (!GTK_WIDGET_VISIBLE (window))
+    gtk_widget_show_all (window);
   else
     {
       gtk_widget_destroy (window);
       window = NULL;
-      if (timeout != 0)
-        {
-          g_source_remove (timeout);
-          timeout = 0;
-        }
     }
 
   return window;

demos/gtk-demo/main.c

@@ -941,8 +941,8 @@ main (int argc, char **argv)
   if (g_file_test ("../../gdk-pixbuf/libpixbufloader-pnm.la",
                    G_FILE_TEST_EXISTS))
     {
-      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/loaders.cache", TRUE);
-      g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/immodules.cache", TRUE);
+      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
+      g_setenv ("GTK_IM_MODULE_FILE", "../../modules/input/gtk.immodules", TRUE);
     }
   /* -- End of hack -- */
   

demos/gtk-demo/menus.c

@@ -191,12 +191,12 @@ do_menus (GtkWidget *do_widget)
       g_signal_connect_swapped (button, "clicked",
 				G_CALLBACK(gtk_widget_destroy), window);
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      gtk_widget_set_can_default (button, TRUE);
+      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
       gtk_widget_grab_default (button);
       gtk_widget_show (button);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/offscreen_window.c

@@ -74,7 +74,7 @@ to_child (GtkRotatedBin *bin,
 
   s = sin (bin->angle);
   c = cos (bin->angle);
-  gtk_widget_get_allocation (bin->child, &child_area);
+  child_area = bin->child->allocation;
 
   w = c * child_area.width + s * child_area.height;
   h = s * child_area.width + c * child_area.height;
@@ -114,7 +114,7 @@ to_parent (GtkRotatedBin *bin,
 
   s = sin (bin->angle);
   c = cos (bin->angle);
-  gtk_widget_get_allocation (bin->child, &child_area);
+  child_area = bin->child->allocation;
 
   w = c * child_area.width + s * child_area.height;
   h = s * child_area.width + c * child_area.height;
@@ -166,7 +166,7 @@ gtk_rotated_bin_class_init (GtkRotatedBinClass *klass)
 static void
 gtk_rotated_bin_init (GtkRotatedBin *bin)
 {
-  gtk_widget_set_has_window (GTK_WIDGET (bin), TRUE);
+  GTK_WIDGET_UNSET_FLAGS (bin, GTK_NO_WINDOW);
 }
 
 GtkWidget *
@@ -184,11 +184,11 @@ pick_offscreen_child (GdkWindow     *offscreen_window,
  GtkAllocation child_area;
  double x, y;
 
- if (bin->child && gtk_widget_get_visible (bin->child))
+ if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     {
       to_child (bin, widget_x, widget_y, &x, &y);
 
-      gtk_widget_get_allocation (bin->child, &child_area);
+      child_area = bin->child->allocation;
 
       if (x >= 0 && x < child_area.width &&
           y >= 0 && y < child_area.height)
@@ -224,23 +224,19 @@ static void
 gtk_rotated_bin_realize (GtkWidget *widget)
 {
   GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-  GtkAllocation allocation;
-  GtkStyle *style;
-  GdkWindow *window;
   GdkWindowAttr attributes;
   gint attributes_mask;
-  guint border_width;
+  gint border_width;
   GtkRequisition child_requisition;
 
-  gtk_widget_set_realized (widget, TRUE);
+  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
-  gtk_widget_get_allocation (widget, &allocation);
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  border_width = GTK_CONTAINER (widget)->border_width;
 
-  attributes.x = allocation.x + border_width;
-  attributes.y = allocation.y + border_width;
-  attributes.width = allocation.width - 2 * border_width;
-  attributes.height = allocation.height - 2 * border_width;
+  attributes.x = widget->allocation.x + border_width;
+  attributes.y = widget->allocation.y + border_width;
+  attributes.width = widget->allocation.width - 2 * border_width;
+  attributes.height = widget->allocation.height - 2 * border_width;
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.event_mask = gtk_widget_get_events (widget)
                         | GDK_EXPOSURE_MASK
@@ -257,39 +253,35 @@ gtk_rotated_bin_realize (GtkWidget *widget)
 
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 
-  window = gdk_window_new (gtk_widget_get_parent_window (widget),
-                           &attributes, attributes_mask);
-  gtk_widget_set_window (widget, window);
-  gdk_window_set_user_data (window, widget);
-  g_signal_connect (window, "pick-embedded-child",
+  widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
+                                   &attributes, attributes_mask);
+  gdk_window_set_user_data (widget->window, widget);
+  g_signal_connect (widget->window, "pick-embedded-child",
                     G_CALLBACK (pick_offscreen_child), bin);
 
   attributes.window_type = GDK_WINDOW_OFFSCREEN;
 
   child_requisition.width = child_requisition.height = 0;
-  if (bin->child && gtk_widget_get_visible (bin->child))
+  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     {
-      GtkAllocation child_allocation;
-
-      gtk_widget_get_allocation (bin->child, &child_allocation);
-      attributes.width = child_allocation.width;
-      attributes.height = child_allocation.height;
+      attributes.width = bin->child->allocation.width;
+      attributes.height = bin->child->allocation.height;
     }
   bin->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
                                           &attributes, attributes_mask);
   gdk_window_set_user_data (bin->offscreen_window, widget);
   if (bin->child)
     gtk_widget_set_parent_window (bin->child, bin->offscreen_window);
-  gdk_offscreen_window_set_embedder (bin->offscreen_window, window);
+  gdk_offscreen_window_set_embedder (bin->offscreen_window, widget->window);
   g_signal_connect (bin->offscreen_window, "to-embedder",
                     G_CALLBACK (offscreen_window_to_parent), bin);
   g_signal_connect (bin->offscreen_window, "from-embedder",
                     G_CALLBACK (offscreen_window_from_parent), bin);
 
-  gtk_widget_style_attach (widget);
-  style = gtk_widget_get_style (widget);
-  gtk_style_set_background (style, window, GTK_STATE_NORMAL);
-  gtk_style_set_background (style, bin->offscreen_window, GTK_STATE_NORMAL);
+  widget->style = gtk_style_attach (widget->style, widget->window);
+
+  gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+  gtk_style_set_background (widget->style, bin->offscreen_window, GTK_STATE_NORMAL);
   gdk_window_show (bin->offscreen_window);
 }
 
@@ -339,7 +331,7 @@ gtk_rotated_bin_remove (GtkContainer *container,
   GtkRotatedBin *bin = GTK_ROTATED_BIN (container);
   gboolean was_visible;
 
-  was_visible = gtk_widget_get_visible (widget);
+  was_visible = GTK_WIDGET_VISIBLE (widget);
 
   if (bin->child == widget)
     {
@@ -347,7 +339,7 @@ gtk_rotated_bin_remove (GtkContainer *container,
 
       bin->child = NULL;
 
-      if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
+      if (was_visible && GTK_WIDGET_VISIBLE (container))
         gtk_widget_queue_resize (GTK_WIDGET (container));
     }
 }
@@ -386,12 +378,11 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
   GtkRequisition child_requisition;
   double s, c;
   double w, h;
-  guint border_width;
 
   child_requisition.width = 0;
   child_requisition.height = 0;
 
-  if (bin->child && gtk_widget_get_visible (bin->child))
+  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     gtk_widget_size_request (bin->child, &child_requisition);
 
   s = sin (bin->angle);
@@ -399,9 +390,8 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
   w = c * child_requisition.width + s * child_requisition.height;
   h = s * child_requisition.width + c * child_requisition.height;
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-  requisition->width = border_width * 2 + w;
-  requisition->height = border_width * 2 + h;
+  requisition->width = GTK_CONTAINER (widget)->border_width * 2 + w;
+  requisition->height = GTK_CONTAINER (widget)->border_width * 2 + h;
 }
 
 static void
@@ -409,24 +399,24 @@ gtk_rotated_bin_size_allocate (GtkWidget     *widget,
                                GtkAllocation *allocation)
 {
   GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-  guint border_width;
+  gint border_width;
   gint w, h;
   gdouble s, c;
 
-  gtk_widget_set_allocation (widget, allocation);
+  widget->allocation = *allocation;
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  border_width = GTK_CONTAINER (widget)->border_width;
 
   w = allocation->width - border_width * 2;
   h = allocation->height - border_width * 2;
 
-  if (gtk_widget_get_realized (widget))
-    gdk_window_move_resize (gtk_widget_get_window (widget),
+  if (GTK_WIDGET_REALIZED (widget))
+    gdk_window_move_resize (widget->window,
                             allocation->x + border_width,
                             allocation->y + border_width,
                             w, h);
 
-  if (bin->child && gtk_widget_get_visible (bin->child))
+  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     {
       GtkRequisition child_requisition;
       GtkAllocation child_allocation;
@@ -446,7 +436,7 @@ gtk_rotated_bin_size_allocate (GtkWidget     *widget,
         child_allocation.width = MIN ((w - s * child_allocation.height) / c,
                                       (h - c * child_allocation.height) / s);
 
-      if (gtk_widget_get_realized (widget))
+      if (GTK_WIDGET_REALIZED (widget))
         gdk_window_move_resize (bin->offscreen_window,
                                 child_allocation.x,
                                 child_allocation.y,
@@ -462,8 +452,7 @@ static gboolean
 gtk_rotated_bin_damage (GtkWidget      *widget,
                         GdkEventExpose *event)
 {
-  gdk_window_invalidate_rect (gtk_widget_get_window (widget),
-                              NULL, FALSE);
+  gdk_window_invalidate_rect (widget->window, NULL, FALSE);
 
   return TRUE;
 }
@@ -473,26 +462,24 @@ gtk_rotated_bin_expose (GtkWidget      *widget,
                         GdkEventExpose *event)
 {
   GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-  GdkWindow *window;
   gint width, height;
   gdouble s, c;
   gdouble w, h;
 
-  if (gtk_widget_is_drawable (widget))
+  if (GTK_WIDGET_DRAWABLE (widget))
     {
-      window = gtk_widget_get_window (widget);
-      if (event->window == window)
+      if (event->window == widget->window)
         {
           GdkPixmap *pixmap;
           GtkAllocation child_area;
           cairo_t *cr;
 
-          if (bin->child && gtk_widget_get_visible (bin->child))
+          if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
             {
               pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
-              gtk_widget_get_allocation (bin->child, &child_area);
+              child_area = bin->child->allocation;
 
-              cr = gdk_cairo_create (window);
+              cr = gdk_cairo_create (widget->window);
 
               /* transform */
               s = sin (bin->angle);
@@ -518,7 +505,7 @@ gtk_rotated_bin_expose (GtkWidget      *widget,
         }
       else if (event->window == bin->offscreen_window)
         {
-          gtk_paint_flat_box (gtk_widget_get_style (widget), event->window,
+          gtk_paint_flat_box (widget->style, event->window,
                               GTK_STATE_NORMAL, GTK_SHADOW_NONE,
                               &event->area, widget, "blah",
                               0, 0, -1, -1);
@@ -579,7 +566,7 @@ do_offscreen_window (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (bin), button);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/offscreen_window2.c

@@ -104,7 +104,7 @@ gtk_mirror_bin_class_init (GtkMirrorBinClass *klass)
 static void
 gtk_mirror_bin_init (GtkMirrorBin *bin)
 {
-  gtk_widget_set_has_window (GTK_WIDGET (bin), TRUE);
+  GTK_WIDGET_UNSET_FLAGS (bin, GTK_NO_WINDOW);
 }
 
 GtkWidget *
@@ -122,11 +122,11 @@ pick_offscreen_child (GdkWindow     *offscreen_window,
  GtkAllocation child_area;
  double x, y;
 
- if (bin->child && gtk_widget_get_visible (bin->child))
+ if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     {
       to_child (bin, widget_x, widget_y, &x, &y);
 
-      gtk_widget_get_allocation (bin->child, &child_area);
+      child_area = bin->child->allocation;
 
       if (x >= 0 && x < child_area.width &&
           y >= 0 && y < child_area.height)
@@ -162,23 +162,19 @@ static void
 gtk_mirror_bin_realize (GtkWidget *widget)
 {
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
-  GtkAllocation allocation;
-  GtkStyle *style;
-  GdkWindow *window;
   GdkWindowAttr attributes;
   gint attributes_mask;
-  guint border_width;
+  gint border_width;
   GtkRequisition child_requisition;
 
-  gtk_widget_set_realized (widget, TRUE);
+  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
-  gtk_widget_get_allocation (widget, &allocation);
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  border_width = GTK_CONTAINER (widget)->border_width;
 
-  attributes.x = allocation.x + border_width;
-  attributes.y = allocation.y + border_width;
-  attributes.width = allocation.width - 2 * border_width;
-  attributes.height = allocation.height - 2 * border_width;
+  attributes.x = widget->allocation.x + border_width;
+  attributes.y = widget->allocation.y + border_width;
+  attributes.width = widget->allocation.width - 2 * border_width;
+  attributes.height = widget->allocation.height - 2 * border_width;
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.event_mask = gtk_widget_get_events (widget)
                         | GDK_EXPOSURE_MASK
@@ -195,39 +191,35 @@ gtk_mirror_bin_realize (GtkWidget *widget)
 
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 
-  window = gdk_window_new (gtk_widget_get_parent_window (widget),
-                           &attributes, attributes_mask);
-  gtk_widget_set_window (widget, window);
-  gdk_window_set_user_data (window, widget);
-  g_signal_connect (window, "pick-embedded-child",
+  widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
+                                   &attributes, attributes_mask);
+  gdk_window_set_user_data (widget->window, widget);
+  g_signal_connect (widget->window, "pick-embedded-child",
                     G_CALLBACK (pick_offscreen_child), bin);
 
   attributes.window_type = GDK_WINDOW_OFFSCREEN;
 
   child_requisition.width = child_requisition.height = 0;
-  if (bin->child && gtk_widget_get_visible (bin->child))
+  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     {
-      GtkAllocation child_allocation;
-
-      gtk_widget_get_allocation (bin->child, &child_allocation);
-      attributes.width = child_allocation.width;
-      attributes.height = child_allocation.height;
+      attributes.width = bin->child->allocation.width;
+      attributes.height = bin->child->allocation.height;
     }
   bin->offscreen_window = gdk_window_new (gtk_widget_get_root_window (widget),
                                           &attributes, attributes_mask);
   gdk_window_set_user_data (bin->offscreen_window, widget);
   if (bin->child)
     gtk_widget_set_parent_window (bin->child, bin->offscreen_window);
-  gdk_offscreen_window_set_embedder (bin->offscreen_window, window);
+  gdk_offscreen_window_set_embedder (bin->offscreen_window, widget->window);
   g_signal_connect (bin->offscreen_window, "to-embedder",
                     G_CALLBACK (offscreen_window_to_parent), bin);
   g_signal_connect (bin->offscreen_window, "from-embedder",
                     G_CALLBACK (offscreen_window_from_parent), bin);
 
-  gtk_widget_style_attach (widget);
-  style = gtk_widget_get_style (widget);
-  gtk_style_set_background (style, window, GTK_STATE_NORMAL);
-  gtk_style_set_background (style, bin->offscreen_window, GTK_STATE_NORMAL);
+  widget->style = gtk_style_attach (widget->style, widget->window);
+
+  gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+  gtk_style_set_background (widget->style, bin->offscreen_window, GTK_STATE_NORMAL);
   gdk_window_show (bin->offscreen_window);
 }
 
@@ -277,7 +269,7 @@ gtk_mirror_bin_remove (GtkContainer *container,
   GtkMirrorBin *bin = GTK_MIRROR_BIN (container);
   gboolean was_visible;
 
-  was_visible = gtk_widget_get_visible (widget);
+  was_visible = GTK_WIDGET_VISIBLE (widget);
 
   if (bin->child == widget)
     {
@@ -285,7 +277,7 @@ gtk_mirror_bin_remove (GtkContainer *container,
 
       bin->child = NULL;
 
-      if (was_visible && gtk_widget_get_visible (GTK_WIDGET (container)))
+      if (was_visible && GTK_WIDGET_VISIBLE (container))
         gtk_widget_queue_resize (GTK_WIDGET (container));
     }
 }
@@ -310,17 +302,15 @@ gtk_mirror_bin_size_request (GtkWidget      *widget,
 {
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   GtkRequisition child_requisition;
-  guint border_width;
 
   child_requisition.width = 0;
   child_requisition.height = 0;
 
-  if (bin->child && gtk_widget_get_visible (bin->child))
+  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     gtk_widget_size_request (bin->child, &child_requisition);
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-  requisition->width = border_width * 2 + child_requisition.width + 10;
-  requisition->height = border_width * 2 + child_requisition.height * 2 + 10;
+  requisition->width = GTK_CONTAINER (widget)->border_width * 2 + child_requisition.width + 10;
+  requisition->height = GTK_CONTAINER (widget)->border_width * 2 + child_requisition.height * 2 + 10;
 }
 
 static void
@@ -328,23 +318,22 @@ gtk_mirror_bin_size_allocate (GtkWidget     *widget,
                                GtkAllocation *allocation)
 {
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
+  gint border_width;
   gint w, h;
-  guint border_width;
+  widget->allocation = *allocation;
 
-  gtk_widget_set_allocation (widget, allocation);
-
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+  border_width = GTK_CONTAINER (widget)->border_width;
 
   w = allocation->width - border_width * 2;
   h = allocation->height - border_width * 2;
 
-  if (gtk_widget_get_realized (widget))
-    gdk_window_move_resize (gtk_widget_get_window (widget),
+  if (GTK_WIDGET_REALIZED (widget))
+    gdk_window_move_resize (widget->window,
                             allocation->x + border_width,
                             allocation->y + border_width,
                             w, h);
 
-  if (bin->child && gtk_widget_get_visible (bin->child))
+  if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
     {
       GtkRequisition child_requisition;
       GtkAllocation child_allocation;
@@ -355,7 +344,7 @@ gtk_mirror_bin_size_allocate (GtkWidget     *widget,
       child_allocation.height = child_requisition.height;
       child_allocation.width = child_requisition.width;
 
-      if (gtk_widget_get_realized (widget))
+      if (GTK_WIDGET_REALIZED (widget))
         gdk_window_move_resize (bin->offscreen_window,
                                 allocation->x + border_width,
                                 allocation->y + border_width,
@@ -368,8 +357,7 @@ static gboolean
 gtk_mirror_bin_damage (GtkWidget      *widget,
                         GdkEventExpose *event)
 {
-  gdk_window_invalidate_rect (gtk_widget_get_window (widget),
-                              NULL, FALSE);
+  gdk_window_invalidate_rect (widget->window, NULL, FALSE);
 
   return TRUE;
 }
@@ -379,25 +367,23 @@ gtk_mirror_bin_expose (GtkWidget      *widget,
                         GdkEventExpose *event)
 {
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
-  GdkWindow *window;
   gint width, height;
 
-  if (gtk_widget_is_drawable (widget))
+  if (GTK_WIDGET_DRAWABLE (widget))
     {
-      window = gtk_widget_get_window (widget);
-      if (event->window == window)
+      if (event->window == widget->window)
         {
           GdkPixmap *pixmap;
           cairo_t *cr;
           cairo_matrix_t matrix;
           cairo_pattern_t *mask;
 
-          if (bin->child && gtk_widget_get_visible (bin->child))
+          if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
             {
               pixmap = gdk_offscreen_window_get_pixmap (bin->offscreen_window);
               gdk_drawable_get_size (pixmap, &width, &height);
 
-              cr = gdk_cairo_create (window);
+              cr = gdk_cairo_create (widget->window);
 
               cairo_save (cr);
 
@@ -437,7 +423,7 @@ gtk_mirror_bin_expose (GtkWidget      *widget,
         }
       else if (event->window == bin->offscreen_window)
         {
-          gtk_paint_flat_box (gtk_widget_get_style (widget), event->window,
+          gtk_paint_flat_box (widget->style, event->window,
                               GTK_STATE_NORMAL, GTK_SHADOW_NONE,
                               &event->area, widget, "blah",
                               0, 0, -1, -1);
@@ -501,7 +487,7 @@ do_offscreen_window2 (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (hbox), applybutton, FALSE, FALSE, 0);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/panes.c

@@ -17,23 +17,15 @@ void
 toggle_resize (GtkWidget *widget,
 	       GtkWidget *child)
 {
-  GtkWidget *parent;
-  GtkPaned *paned;
-  gboolean is_child1;
+  GtkPaned *paned = GTK_PANED (child->parent);
+  gboolean is_child1 = (child == paned->child1);
   gboolean resize, shrink;
 
-  parent = gtk_widget_get_parent (child);
-  paned = GTK_PANED (parent);
-
-  is_child1 = (child == gtk_paned_get_child1 (paned));
-
-  gtk_container_child_get (GTK_CONTAINER (paned), child,
-                           "resize", &resize,
-                           "shrink", &shrink,
-                           NULL);
+  resize = is_child1 ? paned->child1_resize : paned->child2_resize;
+  shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
 
   g_object_ref (child);
-  gtk_container_remove (GTK_CONTAINER (parent), child);
+  gtk_container_remove (GTK_CONTAINER (child->parent), child);
   if (is_child1)
     gtk_paned_pack1 (paned, child, !resize, shrink);
   else
@@ -45,23 +37,15 @@ void
 toggle_shrink (GtkWidget *widget,
 	       GtkWidget *child)
 {
-  GtkWidget *parent;
-  GtkPaned *paned;
-  gboolean is_child1;
+  GtkPaned *paned = GTK_PANED (child->parent);
+  gboolean is_child1 = (child == paned->child1);
   gboolean resize, shrink;
 
-  parent = gtk_widget_get_parent (child);
-  paned = GTK_PANED (parent);
-
-  is_child1 = (child == gtk_paned_get_child1 (paned));
-
-  gtk_container_child_get (GTK_CONTAINER (paned), child,
-                           "resize", &resize,
-                           "shrink", &shrink,
-                           NULL);
+  resize = is_child1 ? paned->child1_resize : paned->child2_resize;
+  shrink = is_child1 ? paned->child1_shrink : paned->child2_shrink;
 
   g_object_ref (child);
-  gtk_container_remove (GTK_CONTAINER (parent), child);
+  gtk_container_remove (GTK_CONTAINER (child->parent), child);
   if (is_child1)
     gtk_paned_pack1 (paned, child, resize, !shrink);
   else
@@ -75,15 +59,11 @@ create_pane_options (GtkPaned	 *paned,
 		     const gchar *label1,
 		     const gchar *label2)
 {
-  GtkWidget *child1, *child2;
   GtkWidget *frame;
   GtkWidget *table;
   GtkWidget *label;
   GtkWidget *check_button;
-
-  child1 = gtk_paned_get_child1 (paned);
-  child2 = gtk_paned_get_child2 (paned);
-
+  
   frame = gtk_frame_new (frame_label);
   gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
   
@@ -98,16 +78,16 @@ create_pane_options (GtkPaned	 *paned,
   gtk_table_attach_defaults (GTK_TABLE (table), check_button,
 			     0, 1, 1, 2);
   g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_resize), child1);
-
+		    G_CALLBACK (toggle_resize), paned->child1);
+  
   check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
   gtk_table_attach_defaults (GTK_TABLE (table), check_button,
 			     0, 1, 2, 3);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
 			       TRUE);
   g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_shrink), child1);
-
+		    G_CALLBACK (toggle_shrink), paned->child1);
+  
   label = gtk_label_new (label2);
   gtk_table_attach_defaults (GTK_TABLE (table), label,
 			     1, 2, 0, 1);
@@ -118,15 +98,15 @@ create_pane_options (GtkPaned	 *paned,
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
 			       TRUE);
   g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_resize), child2);
-
+		    G_CALLBACK (toggle_resize), paned->child2);
+  
   check_button = gtk_check_button_new_with_mnemonic ("_Shrink");
   gtk_table_attach_defaults (GTK_TABLE (table), check_button,
 			     1, 2, 2, 3);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
 			       TRUE);
   g_signal_connect (check_button, "toggled",
-		    G_CALLBACK (toggle_shrink), child2);
+		    G_CALLBACK (toggle_shrink), paned->child2);
 
   return frame;
 }
@@ -200,7 +180,7 @@ do_panes (GtkWidget *do_widget)
       gtk_widget_show_all (vbox);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/pickers.c

@@ -59,7 +59,7 @@ do_pickers (GtkWidget *do_widget)
     gtk_table_attach_defaults (GTK_TABLE (table), picker, 1, 2, 3, 4);
   }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/pixbufs.c

@@ -100,15 +100,20 @@ expose_cb (GtkWidget      *widget,
            GdkEventExpose *event,
            gpointer        data)
 {
-  cairo_t *cr;
+  guchar *pixels;
+  int rowstride;
 
-  cr = gdk_cairo_create (event->window);
+  rowstride = gdk_pixbuf_get_rowstride (frame);
 
-  gdk_cairo_set_source_pixbuf (cr, frame, 0, 0);
-  gdk_cairo_rectangle (cr, &event->area);
-  cairo_fill (cr);
+  pixels = gdk_pixbuf_get_pixels (frame) + rowstride * event->area.y + event->area.x * 3;
 
-  cairo_destroy (cr);
+  gdk_draw_rgb_image_dithalign (widget->window,
+                                widget->style->black_gc,
+                                event->area.x, event->area.y,
+                                event->area.width, event->area.height,
+                                GDK_RGB_DITHER_NORMAL,
+                                pixels, rowstride,
+                                event->area.x, event->area.y);
 
   return TRUE;
 }
@@ -255,7 +260,7 @@ do_pixbufs (GtkWidget *do_widget)
         }
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/printing.c

@@ -149,8 +149,7 @@ do_printing (GtkWidget *do_widget)
   GtkPrintOperation *operation;
   GtkPrintSettings *settings;
   PrintData *data;
-  gchar *uri, *ext;
-  const gchar *dir;
+  gchar *uri, *dir, *ext;
   GError *error = NULL;
 
   operation = gtk_print_operation_new ();

demos/gtk-demo/rotated_text.c

@@ -99,8 +99,6 @@ rotated_text_expose_event (GtkWidget      *widget,
 #define N_WORDS 5
 #define FONT "Serif 18"
 
-  GtkAllocation allocation;
-
   PangoContext *context;
   PangoLayout *layout;
   PangoFontDescription *desc;
@@ -110,20 +108,16 @@ rotated_text_expose_event (GtkWidget      *widget,
 
   PangoAttrList *attrs;
 
-  int width;
-  int height;
+  int width = widget->allocation.width;
+  int height = widget->allocation.height;
   double device_radius;
   int i;
 
-  gtk_widget_get_allocation (widget, &allocation);
-  width = allocation.width;
-  height = allocation.height;
-
   /* Create a cairo context and set up a transformation matrix so that the user
    * space coordinates for the centered square where we draw are [-RADIUS, RADIUS],
    * [-RADIUS, RADIUS].
    * We first center, then change the scale. */
-  cr = gdk_cairo_create (gtk_widget_get_window (widget));
+  cr = gdk_cairo_create (widget->window);
   device_radius = MIN (width, height) / 2.;
   cairo_translate (cr,
 		   device_radius + (width - 2 * device_radius) / 2,
@@ -229,7 +223,7 @@ do_rotated_text (GtkWidget *do_widget)
       pango_attr_list_unref (attrs);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/search_entry.c

@@ -1,6 +1,6 @@
-/* Entry/Search Entry
+/* Entry/Search Entry 
  *
- * GtkEntry allows to display icons and progress information.
+ * GtkEntry allows to display icons and progress information. 
  * This demo shows how to use these features in a search entry.
  */
 
@@ -45,21 +45,21 @@ finish_search (GtkButton *button)
   show_find_button ();
   g_source_remove (search_progress_id);
   search_progress_id = 0;
-
+  
   return FALSE;
 }
 
 static gboolean
 start_search_feedback (gpointer data)
 {
-  search_progress_id = g_timeout_add_full (G_PRIORITY_DEFAULT, 100,
+  search_progress_id = g_timeout_add_full (G_PRIORITY_DEFAULT, 100, 
                                            (GSourceFunc)search_progress, data,
                                            (GDestroyNotify)search_progress_done);
   return FALSE;
 }
 
 static void
-start_search (GtkButton *button,
+start_search (GtkButton *button, 
               GtkEntry  *entry)
 {
   show_cancel_button ();
@@ -77,99 +77,16 @@ stop_search (GtkButton *button,
 }
 
 static void
-clear_entry (GtkEntry *entry)
-{
-  gtk_entry_set_text (entry, "");
-}
-
-static void
-search_by_name (GtkWidget *item,
-                GtkEntry  *entry)
-{
-  gtk_entry_set_icon_from_stock (entry,
-                                 GTK_ENTRY_ICON_PRIMARY,
-                                 GTK_STOCK_FIND);
-  gtk_entry_set_icon_tooltip_text (entry,
-                                   GTK_ENTRY_ICON_PRIMARY,
-                                   "Search by name\n"
-                                   "Click here to change the search type");
-}
-
-static void
-search_by_description (GtkWidget *item,
-                       GtkEntry  *entry)
-{
-  gtk_entry_set_icon_from_stock (entry,
-                                 GTK_ENTRY_ICON_PRIMARY,
-                                 GTK_STOCK_EDIT);
-  gtk_entry_set_icon_tooltip_text (entry,
-                                   GTK_ENTRY_ICON_PRIMARY,
-                                   "Search by description\n"
-                                   "Click here to change the search type");
-}
-
-static void
-search_by_file (GtkWidget *item,
-                GtkEntry  *entry)
-{
-  gtk_entry_set_icon_from_stock (entry,
-                                 GTK_ENTRY_ICON_PRIMARY,
-                                 GTK_STOCK_OPEN);
-  gtk_entry_set_icon_tooltip_text (entry,
-                                   GTK_ENTRY_ICON_PRIMARY,
-                                   "Search by file name\n"
-                                   "Click here to change the search type");
-}
-
-GtkWidget *
-create_search_menu (GtkWidget *entry)
-{
-  GtkWidget *menu;
-  GtkWidget *item;
-  GtkWidget *image;
-
-  menu = gtk_menu_new ();
-
-  item = gtk_image_menu_item_new_with_mnemonic ("Search by _name");
-  image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
-  g_signal_connect (item, "activate",
-                    G_CALLBACK (search_by_name), entry);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-  item = gtk_image_menu_item_new_with_mnemonic ("Search by _description");
-  image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
-  g_signal_connect (item, "activate",
-                    G_CALLBACK (search_by_description), entry);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-  item = gtk_image_menu_item_new_with_mnemonic ("Search by _file name");
-  image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-  gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
-  g_signal_connect (item, "activate",
-                    G_CALLBACK (search_by_file), entry);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-  gtk_widget_show_all (menu);
-
-  return menu;
-}
-
-static void
-icon_press_cb (GtkEntry       *entry,
+icon_press_cb (GtkEntry       *entry, 
                gint            position,
                GdkEventButton *event,
                gpointer        data)
 {
   if (position == GTK_ENTRY_ICON_PRIMARY)
-    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
+    gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 
                     event->button, event->time);
-  else
-    clear_entry (entry);
+  else 
+    gtk_entry_set_text (entry, "");
 }
 
 static void
@@ -180,7 +97,7 @@ text_changed_cb (GtkEntry   *entry,
   gboolean has_text;
 
   has_text = gtk_entry_get_text_length (entry) > 0;
-  gtk_entry_set_icon_sensitive (entry,
+  gtk_entry_set_icon_sensitive (entry, 
                                 GTK_ENTRY_ICON_SECONDARY,
                                 has_text);
   gtk_widget_set_sensitive (button, has_text);
@@ -197,6 +114,45 @@ activate_cb (GtkEntry  *entry,
 
 }
 
+static void
+search_by_name (GtkWidget *item, 
+                GtkEntry  *entry)
+{
+  gtk_entry_set_icon_from_stock (entry,
+                                 GTK_ENTRY_ICON_PRIMARY,
+                                 GTK_STOCK_FIND);
+  gtk_entry_set_icon_tooltip_text (entry,
+                                   GTK_ENTRY_ICON_PRIMARY,
+                                   "Search by name\n"
+                                   "Click here to change the search type");
+} 
+                
+static void
+search_by_description (GtkWidget *item, 
+                       GtkEntry  *entry)
+{
+  gtk_entry_set_icon_from_stock (entry,
+                                 GTK_ENTRY_ICON_PRIMARY,
+                                 GTK_STOCK_EDIT);
+  gtk_entry_set_icon_tooltip_text (entry,
+                                   GTK_ENTRY_ICON_PRIMARY,
+                                   "Search by description\n"
+                                   "Click here to change the search type");
+} 
+                
+static void
+search_by_file (GtkWidget *item, 
+                GtkEntry  *entry)
+{
+  gtk_entry_set_icon_from_stock (entry,
+                                 GTK_ENTRY_ICON_PRIMARY,
+                                 GTK_STOCK_OPEN);
+  gtk_entry_set_icon_tooltip_text (entry,
+                                   GTK_ENTRY_ICON_PRIMARY,
+                                   "Search by file name\n"
+                                   "Click here to change the search type");
+} 
+
 static void
 search_entry_destroyed (GtkWidget  *widget)
 {
@@ -209,54 +165,27 @@ search_entry_destroyed (GtkWidget  *widget)
   window = NULL;
 }
 
-static void
-entry_populate_popup (GtkEntry *entry,
-                      GtkMenu  *menu,
-                      gpointer user_data)
-{
-  GtkWidget *item;
-  GtkWidget *search_menu;
-  gboolean has_text;
-
-  has_text = gtk_entry_get_text_length (entry) > 0;
-
-  item = gtk_separator_menu_item_new ();
-  gtk_widget_show (item);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-
-  item = gtk_menu_item_new_with_mnemonic ("C_lear");
-  gtk_widget_show (item);
-  g_signal_connect_swapped (item, "activate",
-                            G_CALLBACK (clear_entry), entry);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-  gtk_widget_set_sensitive (item, has_text);
-
-  search_menu = create_search_menu (GTK_WIDGET (entry));
-  item = gtk_menu_item_new_with_label ("Search by");
-  gtk_widget_show (item);
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), search_menu);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-}
-
+                
 GtkWidget *
 do_search_entry (GtkWidget *do_widget)
 {
-  GtkWidget *content_area;
   GtkWidget *vbox;
   GtkWidget *hbox;
   GtkWidget *label;
   GtkWidget *entry;
+  GtkWidget *item;
+  GtkWidget *image;
   GtkWidget *find_button;
   GtkWidget *cancel_button;
-
+  
   if (!window)
     {
       window = gtk_dialog_new_with_buttons ("Search Entry",
                                             GTK_WINDOW (do_widget),
-                                            0,
-                                            GTK_STOCK_CLOSE,
-                                            GTK_RESPONSE_NONE,
-                                            NULL);
+ 					    0,
+					    GTK_STOCK_CLOSE,
+					    GTK_RESPONSE_NONE,
+					    NULL);
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
       g_signal_connect (window, "response",
@@ -264,10 +193,8 @@ do_search_entry (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (search_entry_destroyed), &window);
 
-      content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
       vbox = gtk_vbox_new (FALSE, 5);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
       label = gtk_label_new (NULL);
@@ -289,43 +216,59 @@ do_search_entry (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (hbox), notebook, FALSE, FALSE, 0);
 
       find_button = gtk_button_new_with_label ("Find");
-      g_signal_connect (find_button, "clicked",
+      g_signal_connect (find_button, "clicked", 
                         G_CALLBACK (start_search), entry);
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), find_button, NULL);
       gtk_widget_show (find_button);
 
       cancel_button = gtk_button_new_with_label ("Cancel");
-      g_signal_connect (cancel_button, "clicked",
+      g_signal_connect (cancel_button, "clicked", 
                         G_CALLBACK (stop_search), NULL);
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), cancel_button, NULL);
       gtk_widget_show (cancel_button);
 
       /* Set up the search icon */
       search_by_name (NULL, GTK_ENTRY (entry));
-
+      
       /* Set up the clear icon */
-      gtk_entry_set_icon_from_stock (GTK_ENTRY (entry),
-                                     GTK_ENTRY_ICON_SECONDARY,
+      gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), 
+                                     GTK_ENTRY_ICON_SECONDARY, 
                                      GTK_STOCK_CLEAR);
       text_changed_cb (GTK_ENTRY (entry), NULL, find_button);
 
-      g_signal_connect (entry, "icon-press",
+      g_signal_connect (entry, "icon-press", 
                         G_CALLBACK (icon_press_cb), NULL);
-      g_signal_connect (entry, "notify::text",
+      g_signal_connect (entry, "notify::text", 
                         G_CALLBACK (text_changed_cb), find_button);
-      g_signal_connect (entry, "activate",
+      g_signal_connect (entry, "activate", 
                         G_CALLBACK (activate_cb), NULL);
 
       /* Create the menu */
-      menu = create_search_menu (entry);
+      menu = gtk_menu_new ();
       gtk_menu_attach_to_widget (GTK_MENU (menu), entry, NULL);
 
-      /* add accessible alternatives for icon functionality */
-      g_signal_connect (entry, "populate-popup",
-                        G_CALLBACK (entry_populate_popup), NULL);
+      item = gtk_image_menu_item_new_with_label ("Search by name");
+      image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
+      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+      g_signal_connect (item, "activate", G_CALLBACK (search_by_name), entry);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+      item = gtk_image_menu_item_new_with_label ("Search by description");
+      image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
+      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+      g_signal_connect (item, "activate", G_CALLBACK (search_by_description), entry);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+      item = gtk_image_menu_item_new_with_label ("Search by file name");
+      image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
+      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+      g_signal_connect (item, "activate", G_CALLBACK (search_by_file), entry);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+      gtk_widget_show_all (menu);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     {
@@ -336,3 +279,5 @@ do_search_entry (GtkWidget *do_widget)
 
   return window;
 }
+
+

demos/gtk-demo/sizegroup.c

@@ -82,7 +82,6 @@ toggle_grouping (GtkToggleButton *check_button,
 GtkWidget *
 do_sizegroup (GtkWidget *do_widget)
 {
-  GtkWidget *content_area;
   GtkWidget *table;
   GtkWidget *frame;
   GtkWidget *vbox;
@@ -116,10 +115,8 @@ do_sizegroup (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
 			G_CALLBACK (gtk_widget_destroyed), &window);
 
-      content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
       vbox = gtk_vbox_new (FALSE, 5);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), vbox, TRUE, TRUE, 0);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -161,7 +158,7 @@ do_sizegroup (GtkWidget *do_widget)
 			G_CALLBACK (toggle_grouping), size_group);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     gtk_widget_destroy (window);

demos/gtk-demo/spinner.c

@@ -1,97 +0,0 @@
-/* Spinner
- *
- * GtkSpinner allows to show that background activity is on-going.
- *
- */
-
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-static GtkWidget *spinner_sensitive = NULL;
-static GtkWidget *spinner_unsensitive = NULL;
-
-static void
-on_play_clicked (GtkButton *button, gpointer user_data)
-{
-  gtk_spinner_start (GTK_SPINNER (spinner_sensitive));
-  gtk_spinner_start (GTK_SPINNER (spinner_unsensitive));
-}
-
-static void
-on_stop_clicked (GtkButton *button, gpointer user_data)
-{
-  gtk_spinner_stop (GTK_SPINNER (spinner_sensitive));
-  gtk_spinner_stop (GTK_SPINNER (spinner_unsensitive));
-}
-
-GtkWidget *
-do_spinner (GtkWidget *do_widget)
-{
-  GtkWidget *content_area;
-  GtkWidget *vbox;
-  GtkWidget *hbox;
-  GtkWidget *button;
-  GtkWidget *spinner;
-
-  if (!window)
-  {
-    window = gtk_dialog_new_with_buttons ("GtkSpinner",
-                                          GTK_WINDOW (do_widget),
-                                          0,
-                                          GTK_STOCK_CLOSE,
-                                          GTK_RESPONSE_NONE,
-                                          NULL);
-    gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-
-    g_signal_connect (window, "response",
-                      G_CALLBACK (gtk_widget_destroy), NULL);
-    g_signal_connect (window, "destroy",
-                      G_CALLBACK (gtk_widget_destroyed), &window);
-
-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
-    vbox = gtk_vbox_new (FALSE, 5);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
-    gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-
-    /* Sensitive */
-    hbox = gtk_hbox_new (FALSE, 5);
-    spinner = gtk_spinner_new ();
-    gtk_container_add (GTK_CONTAINER (hbox), spinner);
-    gtk_container_add (GTK_CONTAINER (hbox), gtk_entry_new ());
-    gtk_container_add (GTK_CONTAINER (vbox), hbox);
-    spinner_sensitive = spinner;
-
-    /* Disabled */
-    hbox = gtk_hbox_new (FALSE, 5);
-    spinner = gtk_spinner_new ();
-    gtk_container_add (GTK_CONTAINER (hbox), spinner);
-    gtk_container_add (GTK_CONTAINER (hbox), gtk_entry_new ());
-    gtk_container_add (GTK_CONTAINER (vbox), hbox);
-    spinner_unsensitive = spinner;
-    gtk_widget_set_sensitive (hbox, FALSE);
-
-    button = gtk_button_new_from_stock (GTK_STOCK_MEDIA_PLAY);
-    g_signal_connect (G_OBJECT (button), "clicked",
-                      G_CALLBACK (on_play_clicked), spinner);
-    gtk_container_add (GTK_CONTAINER (vbox), button);
-
-    button = gtk_button_new_from_stock (GTK_STOCK_MEDIA_STOP);
-    g_signal_connect (G_OBJECT (button), "clicked",
-                      G_CALLBACK (on_stop_clicked), spinner);
-    gtk_container_add (GTK_CONTAINER (vbox), button);
-
-    /* Start by default to test for:
-     * https://bugzilla.gnome.org/show_bug.cgi?id=598496 */
-    on_play_clicked (NULL, NULL);
-  }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
-
-

demos/gtk-demo/stock_browser.c

@@ -58,10 +58,18 @@ stock_item_info_copy (StockItemInfo *src)
   return info;
 }
 
-static
-G_DEFINE_BOXED_TYPE (StockItemInfo, stock_item_info,
-                     stock_item_info_copy,
-                     stock_item_info_free)
+static GType
+stock_item_info_get_type (void)
+{
+  static GType our_type = 0;
+  
+  if (our_type == 0)
+    our_type = g_boxed_type_register_static ("StockItemInfo",
+                                             (GBoxedCopyFunc) stock_item_info_copy,
+                                             (GBoxedFreeFunc) stock_item_info_free);
+
+  return our_type;
+}
 
 typedef struct _StockItemDisplay StockItemDisplay;
 struct _StockItemDisplay
@@ -524,7 +532,7 @@ do_stock_browser (GtkWidget *do_widget)
 			NULL);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show_all (window);
     }

demos/gtk-demo/textscroll.c

@@ -191,7 +191,7 @@ do_textscroll (GtkWidget *do_widget)
       create_text_view (hbox, FALSE);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
       gtk_widget_show_all (window);
   else
       gtk_widget_destroy (window);

demos/gtk-demo/textview.c

@@ -14,9 +14,17 @@
 
 static void easter_egg_callback (GtkWidget *button, gpointer data);
 
+#define gray50_width 2
+#define gray50_height 2
+static char gray50_bits[] = {
+  0x02, 0x01
+};
+
 static void
 create_tags (GtkTextBuffer *buffer)
 {
+  GdkBitmap *stipple;
+
   /* Create a bunch of tags. Note that it's also possible to
    * create tags with gtk_text_tag_new() then add them to the
    * tag table for the buffer, gtk_text_buffer_create_tag() is
@@ -66,6 +74,18 @@ create_tags (GtkTextBuffer *buffer)
   gtk_text_buffer_create_tag (buffer, "red_background",
 			      "background", "red", NULL);
 
+  stipple = gdk_bitmap_create_from_data (NULL,
+					 gray50_bits, gray50_width,
+					 gray50_height);
+  
+  gtk_text_buffer_create_tag (buffer, "background_stipple",
+			      "background_stipple", stipple, NULL);
+
+  gtk_text_buffer_create_tag (buffer, "foreground_stipple",
+			      "foreground_stipple", stipple, NULL);
+
+  g_object_unref (stipple);
+
   gtk_text_buffer_create_tag (buffer, "big_gap_before_line",
 			      "pixels_above_lines", 30, NULL);
 
@@ -207,9 +227,17 @@ insert_text (GtkTextBuffer *buffer)
 					    "red_background", NULL);
   gtk_text_buffer_insert (buffer, &iter, " or even ", -1);  
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-					    "a blue foreground on red background", -1,
+					    "a stippled red background", -1,
+					    "red_background",
+					    "background_stipple",
+					    NULL);
+
+  gtk_text_buffer_insert (buffer, &iter, " or ", -1);  
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+					    "a stippled blue foreground on solid red background", -1,
 					    "blue_foreground",
 					    "red_background",
+					    "foreground_stipple",
 					    NULL);
   gtk_text_buffer_insert (buffer, &iter, " (select that to read it) can be used.\n\n", -1);  
 
@@ -472,7 +500,7 @@ do_textview (GtkWidget *do_widget)
       gtk_widget_show_all (vpaned);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     {
       gtk_widget_show (window);
     }

demos/gtk-demo/toolpalette.c

@@ -1,804 +0,0 @@
-/* Tool Palette
- *
- * A tool palette widget shows groups of toolbar items as a grid of icons
- * or a list of names.
- */
-
-#include <string.h>
-#include <gtk/gtk.h>
-#include "config.h"
-#include "demo-common.h"
-
-static GtkWidget *window = NULL;
-
-static void load_stock_items (GtkToolPalette *palette);
-static void load_toggle_items (GtkToolPalette *palette);
-static void load_special_items (GtkToolPalette *palette);
-
-typedef struct _CanvasItem CanvasItem;
-
-struct _CanvasItem
-{
-  GdkPixbuf *pixbuf;
-  gdouble x, y;
-};
-
-static CanvasItem *drop_item = NULL;
-static GList *canvas_items = NULL;
-
-/********************************/
-/* ====== Canvas drawing ====== */
-/********************************/
-
-static CanvasItem*
-canvas_item_new (GtkWidget     *widget,
-                 GtkToolButton *button,
-                 gdouble        x,
-                 gdouble        y)
-{
-  CanvasItem *item = NULL;
-  const gchar *stock_id;
-  GdkPixbuf *pixbuf;
-
-  stock_id = gtk_tool_button_get_stock_id (button);
-  pixbuf = gtk_widget_render_icon (widget, stock_id, GTK_ICON_SIZE_DIALOG, NULL);
-
-  if (pixbuf)
-    {
-      item = g_slice_new0 (CanvasItem);
-      item->pixbuf = pixbuf;
-      item->x = x;
-      item->y = y;
-    }
-
-  return item;
-}
-
-static void
-canvas_item_free (CanvasItem *item)
-{
-  g_object_unref (item->pixbuf);
-  g_slice_free (CanvasItem, item);
-}
-
-static void
-canvas_item_draw (const CanvasItem *item,
-                  cairo_t          *cr,
-                  gboolean          preview)
-{
-  gdouble cx = gdk_pixbuf_get_width (item->pixbuf);
-  gdouble cy = gdk_pixbuf_get_height (item->pixbuf);
-
-  gdk_cairo_set_source_pixbuf (cr,
-                               item->pixbuf,
-                               item->x - cx * 0.5,
-                               item->y - cy * 0.5);
-
-  if (preview)
-    cairo_paint_with_alpha (cr, 0.6);
-  else
-    cairo_paint (cr);
-}
-
-static gboolean
-canvas_expose_event (GtkWidget      *widget,
-                     GdkEventExpose *event)
-{
-  GtkAllocation allocation;
-  cairo_t *cr;
-  GList *iter;
-
-  cr = gdk_cairo_create (gtk_widget_get_window (widget));
-  gdk_cairo_region (cr, event->region);
-  cairo_clip (cr);
-
-  gtk_widget_get_allocation (widget, &allocation);
-
-  cairo_set_source_rgb (cr, 1, 1, 1);
-  cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
-  cairo_fill (cr);
-
-  for (iter = canvas_items; iter; iter = iter->next)
-    canvas_item_draw (iter->data, cr, FALSE);
-
-  if (drop_item)
-    canvas_item_draw (drop_item, cr, TRUE);
-
-  cairo_destroy (cr);
-
-  return TRUE;
-}
-
-/*****************************/
-/* ====== Palette DnD ====== */
-/*****************************/
-
-static void
-palette_drop_item (GtkToolItem      *drag_item,
-                   GtkToolItemGroup *drop_group,
-                   gint              x,
-                   gint              y)
-{
-  GtkWidget *drag_group = gtk_widget_get_parent (GTK_WIDGET (drag_item));
-  GtkToolItem *drop_item = gtk_tool_item_group_get_drop_item (drop_group, x, y);
-  gint drop_position = -1;
-
-  if (drop_item)
-    drop_position = gtk_tool_item_group_get_item_position (GTK_TOOL_ITEM_GROUP (drop_group), drop_item);
-
-  if (GTK_TOOL_ITEM_GROUP (drag_group) != drop_group)
-    {
-      gboolean homogeneous, expand, fill, new_row;
-
-      g_object_ref (drag_item);
-      gtk_container_child_get (GTK_CONTAINER (drag_group), GTK_WIDGET (drag_item),
-                               "homogeneous", &homogeneous,
-                               "expand", &expand,
-                               "fill", &fill,
-                               "new-row", &new_row,
-                               NULL);
-      gtk_container_remove (GTK_CONTAINER (drag_group), GTK_WIDGET (drag_item));
-      gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (drop_group),
-                                  drag_item, drop_position);
-      gtk_container_child_set (GTK_CONTAINER (drop_group), GTK_WIDGET (drag_item),
-                               "homogeneous", homogeneous,
-                               "expand", expand,
-                               "fill", fill,
-                               "new-row", new_row,
-                               NULL);
-      g_object_unref (drag_item);
-    }
-  else
-    gtk_tool_item_group_set_item_position (GTK_TOOL_ITEM_GROUP (drop_group),
-                                           drag_item, drop_position);
-}
-
-static void
-palette_drop_group (GtkToolPalette   *palette,
-                    GtkToolItemGroup *drag_group,
-                    GtkToolItemGroup *drop_group)
-{
-  gint drop_position = -1;
-
-  if (drop_group)
-    drop_position = gtk_tool_palette_get_group_position (palette, drop_group);
-
-  gtk_tool_palette_set_group_position (palette, drag_group, drop_position);
-}
-
-static void
-palette_drag_data_received (GtkWidget        *widget,
-                            GdkDragContext   *context,
-                            gint              x,
-                            gint              y,
-                            GtkSelectionData *selection,
-                            guint             info,
-                            guint             time,
-                            gpointer          data)
-{
-  GtkAllocation     allocation;
-  GtkToolItemGroup *drop_group = NULL;
-  GtkWidget        *drag_palette = gtk_drag_get_source_widget (context);
-  GtkWidget        *drag_item = NULL;
-
-  while (drag_palette && !GTK_IS_TOOL_PALETTE (drag_palette))
-    drag_palette = gtk_widget_get_parent (drag_palette);
-
-  if (drag_palette)
-    {
-      drag_item = gtk_tool_palette_get_drag_item (GTK_TOOL_PALETTE (drag_palette),
-                                                  selection);
-      drop_group = gtk_tool_palette_get_drop_group (GTK_TOOL_PALETTE (widget),
-                                                    x, y);
-    }
-
-  if (GTK_IS_TOOL_ITEM_GROUP (drag_item))
-    palette_drop_group (GTK_TOOL_PALETTE (drag_palette),
-                        GTK_TOOL_ITEM_GROUP (drag_item),
-                        drop_group);
-  else if (GTK_IS_TOOL_ITEM (drag_item) && drop_group)
-    {
-      gtk_widget_get_allocation (GTK_WIDGET (drop_group), &allocation);
-      palette_drop_item (GTK_TOOL_ITEM (drag_item),
-                         drop_group,
-                         x - allocation.x,
-                         y - allocation.y);
-    }
-}
-
-/********************************/
-/* ====== Passive Canvas ====== */
-/********************************/
-
-static void
-passive_canvas_drag_data_received (GtkWidget        *widget,
-                                   GdkDragContext   *context,
-                                   gint              x,
-                                   gint              y,
-                                   GtkSelectionData *selection,
-                                   guint             info,
-                                   guint             time,
-                                   gpointer          data)
-{
-  /* find the tool button, which is the source of this DnD operation */
-
-  GtkWidget *palette = gtk_drag_get_source_widget (context);
-  CanvasItem *canvas_item = NULL;
-  GtkWidget *tool_item = NULL;
-
-  while (palette && !GTK_IS_TOOL_PALETTE (palette))
-    palette = gtk_widget_get_parent (palette);
-
-  if (palette)
-    tool_item = gtk_tool_palette_get_drag_item (GTK_TOOL_PALETTE (palette),
-                                                selection);
-
-  g_assert (NULL == drop_item);
-
-  /* append a new canvas item when a tool button was found */
-
-  if (GTK_IS_TOOL_ITEM (tool_item))
-    canvas_item = canvas_item_new (widget, GTK_TOOL_BUTTON (tool_item), x, y);
-
-  if (canvas_item)
-    {
-      canvas_items = g_list_append (canvas_items, canvas_item);
-      gtk_widget_queue_draw (widget);
-    }
-}
-
-/************************************/
-/* ====== Interactive Canvas ====== */
-/************************************/
-
-static gboolean
-interactive_canvas_drag_motion (GtkWidget      *widget,
-                                GdkDragContext *context,
-                                gint            x,
-                                gint            y,
-                                guint           time,
-                                gpointer        data)
-{
-  if (drop_item)
-    {
-      /* already have a drop indicator - just update position */
-
-      drop_item->x = x;
-      drop_item->y = y;
-
-      gtk_widget_queue_draw (widget);
-      gdk_drag_status (context, GDK_ACTION_COPY, time);
-    }
-  else
-    {
-      /* request DnD data for creating a drop indicator */
-
-      GdkAtom target = gtk_drag_dest_find_target (widget, context, NULL);
-
-      if (!target)
-        return FALSE;
-
-      gtk_drag_get_data (widget, context, target, time);
-    }
-
-  return TRUE;
-}
-
-static void
-interactive_canvas_drag_data_received (GtkWidget        *widget,
-                                       GdkDragContext   *context,
-                                       gint              x,
-                                       gint              y,
-                                       GtkSelectionData *selection,
-                                       guint             info,
-                                       guint             time,
-                                       gpointer          data)
-
-{
-  /* find the tool button which is the source of this DnD operation */
-
-  GtkWidget *palette = gtk_drag_get_source_widget (context);
-  GtkWidget *tool_item = NULL;
-
-  while (palette && !GTK_IS_TOOL_PALETTE (palette))
-    palette = gtk_widget_get_parent (palette);
-
-  if (palette)
-    tool_item = gtk_tool_palette_get_drag_item (GTK_TOOL_PALETTE (palette),
-                                                selection);
-
-  /* create a drop indicator when a tool button was found */
-
-  g_assert (NULL == drop_item);
-
-  if (GTK_IS_TOOL_ITEM (tool_item))
-    {
-      drop_item = canvas_item_new (widget, GTK_TOOL_BUTTON (tool_item), x, y);
-      gdk_drag_status (context, GDK_ACTION_COPY, time);
-      gtk_widget_queue_draw (widget);
-    }
-}
-
-static gboolean
-interactive_canvas_drag_drop (GtkWidget      *widget,
-                              GdkDragContext *context,
-                              gint            x,
-                              gint            y,
-                              guint           time,
-                              gpointer        data)
-{
-  if (drop_item)
-    {
-      /* turn the drop indicator into a real canvas item */
-
-      drop_item->x = x;
-      drop_item->y = y;
-
-      canvas_items = g_list_append (canvas_items, drop_item);
-      drop_item = NULL;
-
-      /* signal the item was accepted and redraw */
-
-      gtk_drag_finish (context, TRUE, FALSE, time);
-      gtk_widget_queue_draw (widget);
-
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
-static gboolean
-interactive_canvas_real_drag_leave (gpointer data)
-{
-  if (drop_item)
-    {
-      GtkWidget *widget = GTK_WIDGET (data);
-
-      canvas_item_free (drop_item);
-      drop_item = NULL;
-
-      gtk_widget_queue_draw (widget);
-    }
-
-  return FALSE;
-}
-
-static void
-interactive_canvas_drag_leave (GtkWidget      *widget,
-                               GdkDragContext *context,
-                               guint           time,
-                               gpointer        data)
-{
-  /* defer cleanup until a potential "drag-drop" signal was received */
-  g_idle_add (interactive_canvas_real_drag_leave, widget);
-}
-
-static void
-on_combo_orientation_changed (GtkComboBox *combo_box,
-                              gpointer     user_data)
-{
-  GtkToolPalette *palette = GTK_TOOL_PALETTE (user_data);
-  GtkScrolledWindow *sw;
-  GtkTreeModel *model = gtk_combo_box_get_model (combo_box);
-  GtkTreeIter iter;
-  gint val = 0;
-
-  sw = GTK_SCROLLED_WINDOW (gtk_widget_get_parent (GTK_WIDGET (palette)));
-
-  if (!gtk_combo_box_get_active_iter (combo_box, &iter))
-    return;
-
-  gtk_tree_model_get (model, &iter, 1, &val, -1);
-
-  gtk_orientable_set_orientation (GTK_ORIENTABLE (palette), val);
-
-  if (val == GTK_ORIENTATION_HORIZONTAL)
-    gtk_scrolled_window_set_policy (sw, GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
-  else
-    gtk_scrolled_window_set_policy (sw, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-}
-
-static void
-on_combo_style_changed (GtkComboBox *combo_box,
-                        gpointer     user_data)
-{
-  GtkToolPalette *palette = GTK_TOOL_PALETTE (user_data);
-  GtkTreeModel *model = gtk_combo_box_get_model (combo_box);
-  GtkTreeIter iter;
-  gint val = 0;
-
-  if (!gtk_combo_box_get_active_iter (combo_box, &iter))
-    return;
-
-  gtk_tree_model_get (model, &iter, 1, &val, -1);
-
-  if (val == -1)
-    gtk_tool_palette_unset_style (palette);
-  else
-    gtk_tool_palette_set_style (palette, val);
-}
-
-GtkWidget *
-do_toolpalette (GtkWidget *do_widget)
-{
-  GtkWidget *box = NULL;
-  GtkWidget *hbox = NULL;
-  GtkWidget *combo_orientation = NULL;
-  GtkListStore *orientation_model = NULL;
-  GtkWidget *combo_style = NULL;
-  GtkListStore *style_model = NULL;
-  GtkCellRenderer *cell_renderer = NULL;
-  GtkTreeIter iter;
-  GtkWidget *palette = NULL;
-  GtkWidget *palette_scroller = NULL;
-  GtkWidget *notebook = NULL;
-  GtkWidget *contents = NULL;
-  GtkWidget *contents_scroller = NULL;
-
-  if (!window)
-    {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_window_set_screen (GTK_WINDOW (window),
-                             gtk_widget_get_screen (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Tool Palette");
-      gtk_window_set_default_size (GTK_WINDOW (window), 200, 600);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
-      /* Add widgets to control the ToolPalette appearance: */
-      box = gtk_vbox_new (FALSE, 6);
-      gtk_container_add (GTK_CONTAINER (window), box);
-
-      /* Orientation combo box: */
-      orientation_model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
-      gtk_list_store_append (orientation_model, &iter);
-      gtk_list_store_set (orientation_model, &iter,
-                          0, "Horizontal",
-                          1, GTK_ORIENTATION_HORIZONTAL,
-                          -1);
-      gtk_list_store_append (orientation_model, &iter);
-      gtk_list_store_set (orientation_model, &iter,
-                          0, "Vertical",
-                          1, GTK_ORIENTATION_VERTICAL,
-                          -1);
-
-      combo_orientation =
-        gtk_combo_box_new_with_model (GTK_TREE_MODEL (orientation_model));
-      cell_renderer = gtk_cell_renderer_text_new ();
-      gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_orientation),
-                                  cell_renderer,
-                                  TRUE);
-      gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_orientation),
-                                      cell_renderer,
-                                      "text", 0,
-                                      NULL);
-      gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_orientation), &iter);
-      gtk_box_pack_start (GTK_BOX (box), combo_orientation, FALSE, FALSE, 0);
-
-      /* Style combo box: */
-      style_model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
-      gtk_list_store_append (style_model, &iter);
-      gtk_list_store_set (style_model, &iter,
-                          0, "Text",
-                          1, GTK_TOOLBAR_TEXT,
-                          -1);
-      gtk_list_store_append (style_model, &iter);
-      gtk_list_store_set (style_model, &iter,
-                          0, "Both",
-                          1, GTK_TOOLBAR_BOTH,
-                          -1);
-      gtk_list_store_append (style_model, &iter);
-      gtk_list_store_set (style_model, &iter,
-                          0, "Both: Horizontal",
-                          1, GTK_TOOLBAR_BOTH_HORIZ,
-                          -1);
-      gtk_list_store_append (style_model, &iter);
-      gtk_list_store_set (style_model, &iter,
-                          0, "Icons",
-                          1, GTK_TOOLBAR_ICONS,
-                          -1);
-      gtk_list_store_append (style_model, &iter);
-      gtk_list_store_set (style_model, &iter,
-                          0, "Default",
-                          1, -1,  /* A custom meaning for this demo. */
-                          -1);
-      combo_style = gtk_combo_box_new_with_model (GTK_TREE_MODEL (style_model));
-      cell_renderer = gtk_cell_renderer_text_new ();
-      gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_style),
-                                  cell_renderer,
-                                  TRUE);
-      gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_style),
-                                      cell_renderer,
-                                      "text", 0,
-                                      NULL);
-      gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_style), &iter);
-      gtk_box_pack_start (GTK_BOX (box), combo_style, FALSE, FALSE, 0);
-
-      /* Add hbox */
-      hbox = gtk_hbox_new (FALSE, 5);
-      gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE, 0);
-
-      /* Add and fill the ToolPalette: */
-      palette = gtk_tool_palette_new ();
-
-      load_stock_items (GTK_TOOL_PALETTE (palette));
-      load_toggle_items (GTK_TOOL_PALETTE (palette));
-      load_special_items (GTK_TOOL_PALETTE (palette));
-
-      palette_scroller = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (palette_scroller),
-                                      GTK_POLICY_NEVER,
-                                      GTK_POLICY_AUTOMATIC);
-      gtk_container_set_border_width (GTK_CONTAINER (palette_scroller), 6);
-
-      gtk_container_add (GTK_CONTAINER (palette_scroller), palette);
-      gtk_container_add (GTK_CONTAINER (hbox), palette_scroller);
-
-      gtk_widget_show_all (box);
-
-      /* Connect signals: */
-      g_signal_connect (combo_orientation, "changed",
-                        G_CALLBACK (on_combo_orientation_changed), palette);
-      g_signal_connect (combo_style, "changed",
-                        G_CALLBACK (on_combo_style_changed), palette);
-
-      /* Keep the widgets in sync: */
-      on_combo_orientation_changed (GTK_COMBO_BOX (combo_orientation), palette);
-
-      /* ===== notebook ===== */
-
-      notebook = gtk_notebook_new ();
-      gtk_container_set_border_width (GTK_CONTAINER (notebook), 6);
-      gtk_box_pack_end (GTK_BOX(hbox), notebook, FALSE, FALSE, 0);
-
-      /* ===== DnD for tool items ===== */
-
-      g_signal_connect (palette, "drag-data-received",
-                        G_CALLBACK (palette_drag_data_received), NULL);
-
-      gtk_tool_palette_add_drag_dest (GTK_TOOL_PALETTE (palette),
-                                      palette,
-                                      GTK_DEST_DEFAULT_ALL,
-                                      GTK_TOOL_PALETTE_DRAG_ITEMS |
-                                      GTK_TOOL_PALETTE_DRAG_GROUPS,
-                                      GDK_ACTION_MOVE);
-
-      /* ===== passive DnD dest ===== */
-
-      contents = gtk_drawing_area_new ();
-      gtk_widget_set_app_paintable (contents, TRUE);
-
-      g_object_connect (contents,
-                        "signal::expose-event", canvas_expose_event, NULL,
-                        "signal::drag-data-received", passive_canvas_drag_data_received, NULL,
-                        NULL);
-
-      gtk_tool_palette_add_drag_dest (GTK_TOOL_PALETTE (palette),
-                                      contents,
-                                      GTK_DEST_DEFAULT_ALL,
-                                      GTK_TOOL_PALETTE_DRAG_ITEMS,
-                                      GDK_ACTION_COPY);
-
-      contents_scroller = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (contents_scroller),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_ALWAYS);
-      gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (contents_scroller),
-                                             contents);
-      gtk_container_set_border_width (GTK_CONTAINER (contents_scroller), 6);
-
-      gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-                                contents_scroller,
-                                gtk_label_new ("Passive DnD Mode"));
-
-      /* ===== interactive DnD dest ===== */
-
-      contents = gtk_drawing_area_new ();
-      gtk_widget_set_app_paintable (contents, TRUE);
-
-      g_object_connect (contents,
-                        "signal::expose-event", canvas_expose_event, NULL,
-                        "signal::drag-motion", interactive_canvas_drag_motion, NULL,
-                        "signal::drag-data-received", interactive_canvas_drag_data_received, NULL,
-                        "signal::drag-leave", interactive_canvas_drag_leave, NULL,
-                        "signal::drag-drop", interactive_canvas_drag_drop, NULL,
-                        NULL);
-
-      gtk_tool_palette_add_drag_dest (GTK_TOOL_PALETTE (palette),
-                                      contents,
-                                      GTK_DEST_DEFAULT_HIGHLIGHT,
-                                      GTK_TOOL_PALETTE_DRAG_ITEMS,
-                                      GDK_ACTION_COPY);
-
-      contents_scroller = gtk_scrolled_window_new (NULL, NULL);
-      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (contents_scroller),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_ALWAYS);
-      gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (contents_scroller),
-                                             contents);
-      gtk_container_set_border_width (GTK_CONTAINER (contents_scroller), 6);
-
-      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), contents_scroller,
-                                gtk_label_new ("Interactive DnD Mode"));
-    }
-
-  if (!gtk_widget_get_visible (window))
-    {
-      gtk_widget_show_all (window);
-    }
-  else
-    {
-      gtk_widget_destroy (window);
-      window = NULL;
-    }
-
-  return window;
-}
-
-
-static void
-load_stock_items (GtkToolPalette *palette)
-{
-  GtkWidget *group_af = gtk_tool_item_group_new ("Stock Icons (A-F)");
-  GtkWidget *group_gn = gtk_tool_item_group_new ("Stock Icons (G-N)");
-  GtkWidget *group_or = gtk_tool_item_group_new ("Stock Icons (O-R)");
-  GtkWidget *group_sz = gtk_tool_item_group_new ("Stock Icons (S-Z)");
-  GtkWidget *group = NULL;
-
-  GtkToolItem *item;
-  GSList *stock_ids;
-  GSList *iter;
-
-  stock_ids = gtk_stock_list_ids ();
-  stock_ids = g_slist_sort (stock_ids, (GCompareFunc) strcmp);
-
-  gtk_container_add (GTK_CONTAINER (palette), group_af);
-  gtk_container_add (GTK_CONTAINER (palette), group_gn);
-  gtk_container_add (GTK_CONTAINER (palette), group_or);
-  gtk_container_add (GTK_CONTAINER (palette), group_sz);
-
-  for (iter = stock_ids; iter; iter = g_slist_next (iter))
-    {
-      GtkStockItem stock_item;
-      gchar *id = iter->data;
-
-      switch (id[4])
-        {
-          case 'a':
-            group = group_af;
-            break;
-
-          case 'g':
-            group = group_gn;
-            break;
-
-          case 'o':
-            group = group_or;
-            break;
-
-          case 's':
-            group = group_sz;
-            break;
-        }
-
-      item = gtk_tool_button_new_from_stock (id);
-      gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (item), id);
-      gtk_tool_item_set_is_important (GTK_TOOL_ITEM (item), TRUE);
-      gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-
-      if (!gtk_stock_lookup (id, &stock_item) || !stock_item.label)
-        gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), id);
-
-      g_free (id);
-    }
-
-  g_slist_free (stock_ids);
-}
-
-static void
-load_toggle_items (GtkToolPalette *palette)
-{
-  GSList *toggle_group = NULL;
-  GtkToolItem *item;
-  GtkWidget *group;
-  char *label;
-  int i;
-
-  group = gtk_tool_item_group_new ("Radio Item");
-  gtk_container_add (GTK_CONTAINER (palette), group);
-
-  for (i = 1; i <= 10; ++i)
-    {
-      label = g_strdup_printf ("#%d", i);
-      item = gtk_radio_tool_button_new (toggle_group);
-      gtk_tool_button_set_label (GTK_TOOL_BUTTON (item), label);
-      g_free (label);
-
-      gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-      toggle_group = gtk_radio_tool_button_get_group (GTK_RADIO_TOOL_BUTTON (item));
-    }
-}
-
-static GtkToolItem *
-create_entry_item (const char *text)
-{
-  GtkToolItem *item;
-  GtkWidget *entry;
-
-  entry = gtk_entry_new ();
-  gtk_entry_set_text (GTK_ENTRY (entry), text);
-  gtk_entry_set_width_chars (GTK_ENTRY (entry), 5);
-
-  item = gtk_tool_item_new ();
-  gtk_container_add (GTK_CONTAINER (item), entry);
-
-  return item;
-}
-
-static void
-load_special_items (GtkToolPalette *palette)
-{
-  GtkToolItem *item;
-  GtkWidget *group;
-  GtkWidget *label_button;
-
-  group = gtk_tool_item_group_new (NULL);
-  label_button = gtk_button_new_with_label ("Advanced Features");
-  gtk_widget_show (label_button);
-  gtk_tool_item_group_set_label_widget (GTK_TOOL_ITEM_GROUP (group),
-                                        label_button);
-  gtk_container_add (GTK_CONTAINER (palette), group);
-
-  item = create_entry_item ("homogeneous=FALSE");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
-                           "homogeneous", FALSE, NULL);
-
-  item = create_entry_item ("homogeneous=FALSE, expand=TRUE");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
-                           "homogeneous", FALSE, "expand", TRUE,
-                           NULL);
-
-  item = create_entry_item ("homogeneous=FALSE, expand=TRUE, fill=FALSE");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
-                           "homogeneous", FALSE, "expand", TRUE,
-                           "fill", FALSE, NULL);
-
-  item = create_entry_item ("homogeneous=FALSE, expand=TRUE, new-row=TRUE");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
-                           "homogeneous", FALSE, "expand", TRUE,
-                           "new-row", TRUE, NULL);
-
-  item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_UP);
-  gtk_tool_item_set_tooltip_text (item, "Show on vertical palettes only");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_tool_item_set_visible_horizontal (item, FALSE);
-
-  item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
-  gtk_tool_item_set_tooltip_text (item, "Show on horizontal palettes only");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_tool_item_set_visible_vertical (item, FALSE);
-
-  item = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE);
-  gtk_tool_item_set_tooltip_text (item, "Do not show at all");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_widget_set_no_show_all (GTK_WIDGET (item), TRUE);
-
-  item = gtk_tool_button_new_from_stock (GTK_STOCK_FULLSCREEN);
-  gtk_tool_item_set_tooltip_text (item, "Expanded this item");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-  gtk_container_child_set (GTK_CONTAINER (group), GTK_WIDGET (item),
-                           "homogeneous", FALSE,
-                           "expand", TRUE,
-                           NULL);
-
-  item = gtk_tool_button_new_from_stock (GTK_STOCK_HELP);
-  gtk_tool_item_set_tooltip_text (item, "A regular item");
-  gtk_tool_item_group_insert (GTK_TOOL_ITEM_GROUP (group), item, -1);
-}

demos/gtk-demo/tree_store.c

@@ -438,7 +438,7 @@ do_tree_store (GtkWidget *do_widget)
       gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
     }
 
-  if (!gtk_widget_get_visible (window))
+  if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
     {

demos/gtk-demo/ui_manager.c

@@ -221,7 +221,7 @@ do_ui_manager (GtkWidget *do_widget)
       g_signal_connect_swapped (button, "clicked",
 				G_CALLBACK (gtk_widget_destroy), window);
       gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-      gtk_widget_set_can_default (button, TRUE);
+      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
       gtk_widget_grab_default (button);
 
       gtk_widget_show_all (window);

demos/pixbuf-demo.c

@@ -89,14 +89,20 @@ load_pixbufs (void)
 static gint
 expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
-        cairo_t *cr;
-         
-        cr = gdk_cairo_create (event->window);
-        gdk_cairo_set_source_pixbuf (cr, frame, 0, 0);
-        gdk_cairo_rectangle (cr, &event->area);
-        cairo_fill (cr);
+	guchar *pixels;
+	int rowstride;
 
-        cairo_destroy (cr);
+	rowstride = gdk_pixbuf_get_rowstride (frame);
+
+	pixels = gdk_pixbuf_get_pixels (frame) + rowstride * event->area.y + event->area.x * 3;
+		  
+	gdk_draw_rgb_image_dithalign (widget->window,
+				      widget->style->black_gc,
+				      event->area.x, event->area.y,
+				      event->area.width, event->area.height,
+				      GDK_RGB_DITHER_NORMAL,
+				      pixels, rowstride,
+				      event->area.x, event->area.y);
 
 	return TRUE;
 }

demos/pixbuf-init.c

@@ -16,5 +16,5 @@ void
 pixbuf_init (void)
 {
   if (file_exists ("../gdk-pixbuf/libpixbufloader-pnm.la"))
-    g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/loaders.cache", TRUE);
+    g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/gdk-pixbuf.loaders", TRUE);
 }

demos/testpixbuf-color.c

@@ -1,159 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
-#include "config.h"
-#include <stdio.h>
-#include <string.h>
-
-#include <gtk/gtk.h>
-
-#define ICC_PROFILE             "/usr/share/color/icc/bluish.icc"
-#define ICC_PROFILE_SIZE        3966
-
-static gboolean
-save_image_png (const gchar *filename, GdkPixbuf *pixbuf, GError **error)
-{
-	gchar *contents = NULL;
-	gchar *contents_encode = NULL;
-	gsize length;
-	gboolean ret;
-	gint len;
-
-	/* get icc file */
-	ret = g_file_get_contents (ICC_PROFILE, &contents, &length, error);
-	if (!ret)
-		goto out;
-	contents_encode = g_base64_encode ((const guchar *) contents, length);
-	ret = gdk_pixbuf_save (pixbuf, filename, "png", error,
-			       "tEXt::Software", "Hello my name is dave",
-			       "icc-profile", contents_encode,
-			       NULL);
-	len = strlen (contents_encode);
-	g_debug ("ICC profile was %i bytes", len);
-out:
-	g_free (contents);
-	g_free (contents_encode);
-	return ret;
-}
-
-static gboolean
-save_image_tiff (const gchar *filename, GdkPixbuf *pixbuf, GError **error)
-{
-	gchar *contents = NULL;
-	gchar *contents_encode = NULL;
-	gsize length;
-	gboolean ret;
-	gint len;
-
-	/* get icc file */
-	ret = g_file_get_contents (ICC_PROFILE, &contents, &length, error);
-	if (!ret)
-		goto out;
-	contents_encode = g_base64_encode ((const guchar *) contents, length);
-	ret = gdk_pixbuf_save (pixbuf, filename, "tiff", error,
-			       "icc-profile", contents_encode,
-			       NULL);
-	len = strlen (contents_encode);
-	g_debug ("ICC profile was %i bytes", len);
-out:
-	g_free (contents);
-	g_free (contents_encode);
-	return ret;
-}
-
-static gboolean
-save_image_verify (const gchar *filename, GError **error)
-{
-	gboolean ret = FALSE;
-	GdkPixbuf *pixbuf = NULL;
-	const gchar *option;
-	gchar *icc_profile = NULL;
-	gsize len = 0;
-
-	/* load */
-	pixbuf = gdk_pixbuf_new_from_file (filename, error);
-	if (pixbuf == NULL)
-		goto out;
-
-	/* check values */
-	option = gdk_pixbuf_get_option (pixbuf, "icc-profile");
-	if (option == NULL) {
-		*error = g_error_new (1, 0, "no profile set");
-		goto out;
-	}
-
-	/* decode base64 */
-	icc_profile = (gchar *) g_base64_decode (option, &len);
-	if (len != ICC_PROFILE_SIZE) {
-		*error = g_error_new (1, 0,
-		                      "profile length invalid, got %" G_GSIZE_FORMAT,
-		                      len);
-		g_file_set_contents ("error.icc", icc_profile, len, NULL);
-		goto out;
-	}
-
-	/* success */
-	ret = TRUE;
-out:
-	if (pixbuf != NULL)
-		g_object_unref (pixbuf);
-	g_free (icc_profile);
-	return ret;
-}
-
-int
-main (int argc, char **argv)
-{
-	GdkWindow *root;
-	GdkPixbuf *pixbuf;
-	gboolean ret;
-	gint retval = 1;
-	GError *error = NULL;
-
-	gtk_init (&argc, &argv);
-
-	root = gdk_get_default_root_window ();
-	pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
-					       0, 0, 0, 0, 150, 160);
-
-	/* PASS */
-	g_debug ("try to save PNG with a profile");
-	ret = save_image_png ("icc-profile.png", pixbuf, &error);
-	if (!ret) {
-		g_warning ("FAILED: did not save image: %s", error->message);
-		g_error_free (error);
-		goto out;
-	}
-
-	/* PASS */
-	g_debug ("try to save TIFF with a profile");
-	ret = save_image_tiff ("icc-profile.tiff", pixbuf, &error);
-	if (!ret) {
-		g_warning ("FAILED: did not save image: %s", error->message);
-		g_error_free (error);
-		goto out;
-	}
-
-	/* PASS */
-	g_debug ("try to load PNG and get color attributes");
-	ret = save_image_verify ("icc-profile.png", &error);
-	if (!ret) {
-		g_warning ("FAILED: did not load image: %s", error->message);
-		g_error_free (error);
-		goto out;
-	}
-
-	/* PASS */
-	g_debug ("try to load TIFF and get color attributes");
-	ret = save_image_verify ("icc-profile.tiff", &error);
-	if (!ret) {
-		g_warning ("FAILED: did not load image: %s", error->message);
-		g_error_free (error);
-		goto out;
-	}
-
-	/* success */
-	retval = 0;
-	g_debug ("ALL OKAY!");
-out:
-	return retval;
-}

demos/testpixbuf-drawable.c

@@ -0,0 +1,115 @@
+#include "config.h"
+#include <gtk/gtk.h>
+
+int
+close_app (GtkWidget *widget, gpointer data)
+{
+   gtk_main_quit ();
+   return TRUE;
+}
+
+int
+expose_cb (GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data)
+{
+   GdkPixbuf *pixbuf;
+         
+   pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (drawing_area), "pixbuf");
+   if (gdk_pixbuf_get_has_alpha (pixbuf))
+   {
+      gdk_draw_rgb_32_image (drawing_area->window,
+			     drawing_area->style->black_gc,
+			     evt->area.x, evt->area.y,
+			     evt->area.width,
+			     evt->area.height,
+			     GDK_RGB_DITHER_MAX,
+			     gdk_pixbuf_get_pixels (pixbuf) +
+			     (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
+			     (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
+			     gdk_pixbuf_get_rowstride (pixbuf));
+   }
+   else
+   {
+      gdk_draw_rgb_image (drawing_area->window, 
+			  drawing_area->style->black_gc, 
+			  evt->area.x, evt->area.y,
+			  evt->area.width,
+			  evt->area.height,  
+			  GDK_RGB_DITHER_NORMAL,
+			  gdk_pixbuf_get_pixels (pixbuf) +
+			  (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
+			  (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
+			  gdk_pixbuf_get_rowstride (pixbuf));
+   }
+   return FALSE;
+}
+
+int
+configure_cb (GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
+{
+   GdkPixbuf *pixbuf;
+                           
+   pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (drawing_area), "pixbuf");
+    
+   g_print ("X:%d Y:%d\n", evt->width, evt->height);
+   if (evt->width != gdk_pixbuf_get_width (pixbuf) || evt->height != gdk_pixbuf_get_height (pixbuf))
+   {
+      GdkWindow *root;
+      GdkPixbuf *new_pixbuf;
+
+      root = gdk_get_default_root_window ();
+      new_pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
+						 0, 0, 0, 0, evt->width, evt->height);
+      g_object_set_data (G_OBJECT (drawing_area), "pixbuf", new_pixbuf);
+      g_object_unref (pixbuf);
+   }
+
+   return FALSE;
+}
+
+extern void pixbuf_init (void);
+
+int
+main (int argc, char **argv)
+{   
+   GdkWindow     *root;
+   GtkWidget     *window;
+   GtkWidget     *vbox;
+   GtkWidget     *drawing_area;
+   GdkPixbuf     *pixbuf;    
+   
+   pixbuf_init ();
+
+   gtk_init (&argc, &argv);   
+   gdk_rgb_set_verbose (TRUE);
+
+   gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
+
+   root = gdk_get_default_root_window ();
+   pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
+					  0, 0, 0, 0, 150, 160);
+   
+   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+   g_signal_connect (window, "delete_event",
+		     G_CALLBACK (close_app), NULL);
+   g_signal_connect (window, "destroy",   
+		     G_CALLBACK (close_app), NULL);
+   
+   vbox = gtk_vbox_new (FALSE, 0);
+   gtk_container_add (GTK_CONTAINER (window), vbox);  
+   
+   drawing_area = gtk_drawing_area_new ();
+   gtk_widget_set_size_request (GTK_WIDGET (drawing_area),
+                                gdk_pixbuf_get_width (pixbuf),
+                                gdk_pixbuf_get_height (pixbuf));
+   g_signal_connect (drawing_area, "expose_event",
+		     G_CALLBACK (expose_cb), NULL);
+
+   g_signal_connect (drawing_area, "configure_event",
+		     G_CALLBACK (configure_cb), NULL);
+   g_object_set_data (G_OBJECT (drawing_area), "pixbuf", pixbuf);
+   gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE, TRUE, 0);
+   
+   gtk_widget_show_all (window);
+   gtk_main ();
+   return 0;
+}

demos/testpixbuf-save.c

@@ -72,7 +72,7 @@ save_to_loader (const gchar *buf, gsize count, GError **err, gpointer data)
 {
         GdkPixbufLoader *loader = data;
 
-        return gdk_pixbuf_loader_write (loader, (const guchar *)buf, count, err);
+        return gdk_pixbuf_loader_write (loader, buf, count, err);
 }
 
 static GdkPixbuf *
@@ -82,7 +82,7 @@ buffer_to_pixbuf (const gchar *buf, gsize count, GError **err)
         GdkPixbuf *pixbuf;
 
         loader = gdk_pixbuf_loader_new ();
-        if (gdk_pixbuf_loader_write (loader, (const guchar *)buf, count, err) &&
+        if (gdk_pixbuf_loader_write (loader, buf, count, err) && 
             gdk_pixbuf_loader_close (loader, err)) {
                 pixbuf = g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader));
                 g_object_unref (loader);
@@ -311,18 +311,32 @@ static int
 expose_cb (GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data)
 {
         GdkPixbuf *pixbuf;
-        cairo_t *cr;
          
         pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (drawing_area),
 						  "pixbuf");
-
-        cr = gdk_cairo_create (evt->window);
-        gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
-        gdk_cairo_rectangle (cr, &evt->area);
-        cairo_fill (cr);
-
-        cairo_destroy (cr);
-
+        if (gdk_pixbuf_get_has_alpha (pixbuf)) {
+                gdk_draw_rgb_32_image (drawing_area->window,
+                                       drawing_area->style->black_gc,
+                                       evt->area.x, evt->area.y,
+                                       evt->area.width,
+                                       evt->area.height,
+                                       GDK_RGB_DITHER_MAX,
+                                       gdk_pixbuf_get_pixels (pixbuf) +
+                                       (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
+                                       (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
+                                       gdk_pixbuf_get_rowstride (pixbuf));
+        } else {
+                gdk_draw_rgb_image (drawing_area->window, 
+                                    drawing_area->style->black_gc, 
+                                    evt->area.x, evt->area.y,
+                                    evt->area.width,
+                                    evt->area.height,  
+                                    GDK_RGB_DITHER_NORMAL,
+                                    gdk_pixbuf_get_pixels (pixbuf) +
+                                    (evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
+                                    (evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
+                                    gdk_pixbuf_get_rowstride (pixbuf));
+        }
         return FALSE;
 }
 
@@ -360,6 +374,8 @@ main (int argc, char **argv)
    
         gtk_init (&argc, &argv);   
 
+        gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
+
         root = gdk_get_default_root_window ();
         pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
                                                0, 0, 0, 0, 150, 160);

demos/testpixbuf-scale.c

@@ -34,31 +34,25 @@ overall_changed_cb (GtkAdjustment *adjustment, gpointer data)
 gboolean
 expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
-  GtkAllocation allocation;
   GdkPixbuf *dest;
-  cairo_t *cr;
-
-  gdk_window_set_back_pixmap (gtk_widget_get_window (widget),
-                              NULL, FALSE);
 
+  gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
+  
   dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, event->area.width, event->area.height);
 
-  gtk_widget_get_allocation (widget, &allocation);
   gdk_pixbuf_composite_color (pixbuf, dest,
 			      0, 0, event->area.width, event->area.height,
 			      -event->area.x, -event->area.y,
-                              (double) allocation.width / gdk_pixbuf_get_width (pixbuf),
-                              (double) allocation.height / gdk_pixbuf_get_height (pixbuf),
+			      (double) widget->allocation.width / gdk_pixbuf_get_width (pixbuf),
+			      (double) widget->allocation.height / gdk_pixbuf_get_height (pixbuf),
 			      interp_type, overall_alpha,
 			      event->area.x, event->area.y, 16, 0xaaaaaa, 0x555555);
 
-  cr = gdk_cairo_create (event->window);
-
-  gdk_cairo_set_source_pixbuf (cr, dest, 0, 0);
-  gdk_cairo_rectangle (cr, &event->area);
-  cairo_fill (cr);
-
-  cairo_destroy (cr);
+  gdk_draw_pixbuf (widget->window, widget->style->fg_gc[GTK_STATE_NORMAL], dest,
+		   0, 0, event->area.x, event->area.y,
+		   event->area.width, event->area.height,
+		   GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
+  
   g_object_unref (dest);
   
   return TRUE;

demos/testpixbuf.c

@@ -0,0 +1,640 @@
+/* testpixbuf -- test program for gdk-pixbuf code
+ * Copyright (C) 1999 Mark Crichton, Larry Ewing
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <gtk/gtk.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "test-inline-pixbufs.h"
+
+typedef struct {
+	FILE             *imagefile;
+	GdkPixbufLoader  *loader;
+	GtkWidget        **rgbwin;
+	guchar           *buf;
+	guint            timeout;
+	guint            readlen;
+} ProgressFileStatus;
+
+
+#define DEFAULT_WIDTH  24
+#define DEFAULT_HEIGHT 24
+
+static const unsigned char default_image[] = {
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xae, 0xb3, 0xb3, 0xc6, 0xc9, 0xcd, 0xd7, 0xd4, 0xdf,
+	0xec, 0xde, 0xf3, 0xe7, 0xcb, 0xe9, 0xd9, 0xb5, 0xd3, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xb1, 0xb7, 0xa5,
+	0xb0, 0xb8, 0xad, 0xb3, 0xb9, 0xb6, 0xc1, 0xc6, 0xc8, 0xd5, 0xd3, 0xdc,
+	0xec, 0xde, 0xf3, 0xe5, 0xca, 0xe6, 0xe0, 0xbb, 0xd7, 0xe1, 0xad, 0xc2,
+	0xe3, 0xac, 0xa3, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xca, 0xc1, 0xa4, 0xc5, 0xc7, 0xac,
+	0xb7, 0xbe, 0xaf, 0xad, 0xb4, 0xaf, 0xbd, 0xc2, 0xc3, 0xd1, 0xd0, 0xd8,
+	0xec, 0xde, 0xf3, 0xe5, 0xc7, 0xe4, 0xe0, 0xb6, 0xd1, 0xe7, 0xa9, 0xb4,
+	0xed, 0xcd, 0xb6, 0xd6, 0xcf, 0xae, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0x00, 0x00, 0x00, 0xdf, 0xa7, 0x9f, 0xdd, 0xbf, 0xaa, 0xcf, 0xc5, 0xa9,
+	0xc1, 0xc4, 0xac, 0xb2, 0xba, 0xaf, 0xb6, 0xbb, 0xbb, 0xcd, 0xce, 0xd4,
+	0xec, 0xde, 0xf3, 0xe4, 0xc4, 0xe1, 0xe0, 0xaf, 0xc7, 0xea, 0xbc, 0xae,
+	0xe1, 0xd6, 0xb6, 0xc7, 0xcc, 0xae, 0xa2, 0xab, 0x9a, 0x00, 0x00, 0x00,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0x00, 0x00, 0x00, 0xe3, 0xab, 0xc0, 0xe6, 0xa3, 0xa7, 0xdf, 0xba, 0xa8,
+	0xcf, 0xc5, 0xa9, 0xbd, 0xc2, 0xae, 0xad, 0xb4, 0xaf, 0xc6, 0xc9, 0xcd,
+	0xec, 0xde, 0xf3, 0xe2, 0xbf, 0xdc, 0xe7, 0xa9, 0xb4, 0xe7, 0xd6, 0xb8,
+	0xc7, 0xcc, 0xae, 0xac, 0xb6, 0xa6, 0x9d, 0xa8, 0x9f, 0x00, 0x00, 0x00,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xd9, 0xaf, 0xcf, 0xe1, 0xb4, 0xd2, 0xe2, 0xb0, 0xcb, 0xe4, 0xa9, 0xbb,
+	0xe2, 0xb2, 0xa6, 0xcf, 0xc5, 0xa9, 0x6a, 0x6a, 0x6a, 0x0d, 0x0d, 0x0d,
+	0x0d, 0x0d, 0x0d, 0x6a, 0x6a, 0x6a, 0xed, 0xcd, 0xb6, 0xc7, 0xcc, 0xae,
+	0xa6, 0xb1, 0xa3, 0x98, 0xa2, 0x9c, 0x8f, 0x97, 0x96, 0x7e, 0x84, 0x85,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xe8, 0xc6, 0xe7, 0xe5, 0xc2, 0xe3, 0xe3, 0xbd, 0xdd, 0xe1, 0xb6, 0xd5,
+	0xe2, 0xb0, 0xcb, 0x6a, 0x6a, 0x6a, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x6a, 0x6a, 0x6a, 0x9d, 0xa8, 0x9f,
+	0x8f, 0x97, 0x96, 0x8b, 0x90, 0x92, 0x97, 0x9e, 0xa2, 0xa0, 0xa7, 0xae,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xe7, 0xd3, 0xed, 0xe8, 0xd1, 0xed, 0xe8, 0xce, 0xec, 0xe9, 0xcc, 0xeb,
+	0xe8, 0xc6, 0xe7, 0x0d, 0x0d, 0x0d, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x0d, 0x0d, 0x0d, 0x97, 0x9e, 0xa2,
+	0xa7, 0xae, 0xb7, 0xb2, 0xb6, 0xc5, 0xba, 0xbc, 0xce, 0xbf, 0xbe, 0xd3,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xe9, 0xdf, 0xf0, 0xe9, 0xdf, 0xf0, 0xe9, 0xdf, 0xf0, 0xe9, 0xdf, 0xf0,
+	0xe9, 0xdf, 0xf0, 0x0d, 0x0d, 0x0d, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x0d, 0x0d, 0x0d, 0xe1, 0xd2, 0xf7,
+	0xe1, 0xd2, 0xf7, 0xe1, 0xd2, 0xf7, 0xe1, 0xd2, 0xf7, 0xe1, 0xd2, 0xf7,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xca, 0xc7, 0xd2, 0xc5, 0xc4, 0xcd, 0xbf, 0xbf, 0xc7, 0xb8, 0xb9, 0xc0,
+	0xae, 0xaf, 0xb6, 0x6a, 0x6a, 0x6a, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x6a, 0x6a, 0x6a, 0xd5, 0xa8, 0xe1,
+	0xd8, 0xb2, 0xe9, 0xd9, 0xb8, 0xed, 0xdb, 0xbd, 0xf0, 0xdc, 0xbf, 0xf1,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0xa4, 0xa6, 0xac, 0xa8, 0xaa, 0xaf, 0xa0, 0xa6, 0xa8, 0x98, 0x9e, 0x9c,
+	0xa1, 0xa8, 0x9e, 0xb1, 0xb6, 0xa1, 0x6a, 0x6a, 0x6a, 0x0d, 0x0d, 0x0d,
+	0x0d, 0x0d, 0x0d, 0x6a, 0x6a, 0x6a, 0xc0, 0x8c, 0xad, 0xcc, 0x90, 0xb5,
+	0xd3, 0x94, 0xca, 0xd6, 0xa2, 0xdb, 0xd5, 0xa8, 0xe1, 0xcf, 0xa7, 0xdf,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0x00, 0x00, 0x00, 0x98, 0x9f, 0x9b, 0xa1, 0xa8, 0x9e, 0xac, 0xb3, 0xa0,
+	0xb9, 0xb9, 0xa4, 0xd0, 0xb8, 0xa8, 0xc5, 0xb5, 0xb8, 0xb6, 0xbb, 0xad,
+	0xe3, 0xd7, 0xb5, 0xdd, 0xb4, 0xa9, 0xcb, 0x89, 0xac, 0xc0, 0x8c, 0xad,
+	0xc8, 0x91, 0xb5, 0xd1, 0x8d, 0xb7, 0xd3, 0x94, 0xca, 0x00, 0x00, 0x00,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0x00, 0x00, 0x00, 0xa1, 0xa7, 0x98, 0xb1, 0xb6, 0xa1, 0xbd, 0xb9, 0xa5,
+	0xd0, 0xb8, 0xa8, 0xca, 0xb5, 0xb7, 0xb8, 0xb1, 0xb1, 0xc2, 0xc8, 0xb2,
+	0xe3, 0xd7, 0xb5, 0xe1, 0xbf, 0xaf, 0xdb, 0x92, 0x9a, 0xbe, 0x82, 0xa6,
+	0xc0, 0x8c, 0xad, 0xc8, 0x91, 0xb4, 0xc7, 0x8b, 0xb0, 0x00, 0x00, 0x00,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xbc, 0xb6, 0xa1, 0xd0, 0xb8, 0xa8,
+	0xcd, 0xb6, 0xb7, 0xc0, 0xb4, 0xb5, 0xb1, 0xb1, 0xaa, 0xca, 0xd1, 0xb4,
+	0xe3, 0xd7, 0xb5, 0xe2, 0xc1, 0xb0, 0xdb, 0xa8, 0xa3, 0xd2, 0x8a, 0xa9,
+	0xb7, 0x7e, 0xa2, 0xbd, 0x89, 0xa9, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0xc9, 0xaf, 0xaf,
+	0xc5, 0xb5, 0xb8, 0xb8, 0xb1, 0xb1, 0xb6, 0xbb, 0xad, 0xd0, 0xd6, 0xb5,
+	0xe3, 0xd7, 0xb5, 0xe2, 0xbf, 0xaf, 0xdd, 0xb4, 0xa9, 0xdb, 0x92, 0x9a,
+	0xc6, 0x84, 0xa7, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xac, 0xaa, 0xa6, 0xbd, 0xc3, 0xb0, 0xd2, 0xd7, 0xb5,
+	0xe3, 0xd7, 0xb5, 0xe2, 0xbf, 0xae, 0xdb, 0xb6, 0xa8, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff,
+	0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff
+};
+
+
+static const char * book_open_xpm[] = {
+"16 16 4 1",
+"       c None s None",
+".      c black",
+"X      c #808080",
+"o      c white",
+"                ",
+"  ..            ",
+" .Xo.    ...    ",
+" .Xoo. ..oo.    ",
+" .Xooo.Xooo...  ",
+" .Xooo.oooo.X.  ",
+" .Xooo.Xooo.X.  ",
+" .Xooo.oooo.X.  ",
+" .Xooo.Xooo.X.  ",
+" .Xooo.oooo.X.  ",
+"  .Xoo.Xoo..X.  ",
+"   .Xo.o..ooX.  ",
+"    .X..XXXXX.  ",
+"    ..X.......  ",
+"     ..         ",
+"                "};
+
+static const char * book_closed_xpm[] = {
+"16 16 6 1",
+"       c None s None",
+".      c black",
+"X      c red",
+"o      c yellow",
+"O      c #808080",
+"#      c white",
+"                ",
+"       ..       ",
+"     ..XX.      ",
+"   ..XXXXX.     ",
+" ..XXXXXXXX.    ",
+".ooXXXXXXXXX.   ",
+"..ooXXXXXXXXX.  ",
+".X.ooXXXXXXXXX. ",
+".XX.ooXXXXXX..  ",
+" .XX.ooXXX..#O  ",
+"  .XX.oo..##OO. ",
+"   .XX..##OO..  ",
+"    .X.#OO..    ",
+"     ..O..      ",
+"      ..        ",
+"                "};
+
+static const char * mini_page_xpm[] = {
+"16 16 4 1",
+"       c None s None",
+".      c black",
+"X      c white",
+"o      c #808080",
+"                ",
+"   .......      ",
+"   .XXXXX..     ",
+"   .XoooX.X.    ",
+"   .XXXXX....   ",
+"   .XooooXoo.o  ",
+"   .XXXXXXXX.o  ",
+"   .XooooooX.o  ",
+"   .XXXXXXXX.o  ",
+"   .XooooooX.o  ",
+"   .XXXXXXXX.o  ",
+"   .XooooooX.o  ",
+"   .XXXXXXXX.o  ",
+"   ..........o  ",
+"    oooooooooo  ",
+"                "};
+
+static const char * gtk_mini_xpm[] = {
+"15 20 17 1",
+"       c None",
+".      c #14121F",
+"+      c #278828",
+"@      c #9B3334",
+"#      c #284C72",
+"$      c #24692A",
+"%      c #69282E",
+"&      c #37C539",
+"*      c #1D2F4D",
+"=      c #6D7076",
+"-      c #7D8482",
+";      c #E24A49",
+">      c #515357",
+",      c #9B9C9B",
+"'      c #2FA232",
+")      c #3CE23D",
+"!      c #3B6CCB",
+"               ",
+"      ***>     ",
+"    >.*!!!*    ",
+"   ***....#*=  ",
+"  *!*.!!!**!!# ",
+" .!!#*!#*!!!!# ",
+" @%#!.##.*!!$& ",
+" @;%*!*.#!#')) ",
+" @;;@%!!*$&)'' ",
+" @%.%@%$'&)$+' ",
+" @;...@$'*'*)+ ",
+" @;%..@$+*.')$ ",
+" @;%%;;$+..$)# ",
+" @;%%;@$$$'.$# ",
+" %;@@;;$$+))&* ",
+"  %;;;@+$&)&*  ",
+"   %;;@'))+>   ",
+"    %;@'&#     ",
+"     >%$$      ",
+"      >=       "};
+
+const gchar ** xpms[] = { 
+  book_open_xpm,
+  book_closed_xpm,
+  mini_page_xpm,
+  gtk_mini_xpm,
+  NULL
+};
+
+static void
+quit_func (GtkWidget *widget, gpointer dummy)
+{
+	gtk_main_quit ();
+}
+
+static void
+expose_func (GtkWidget *drawing_area, GdkEventExpose *event, gpointer data)
+{
+	GdkPixbuf *pixbuf;
+
+	pixbuf = (GdkPixbuf *)g_object_get_data (G_OBJECT (drawing_area), "pixbuf");
+
+	if (gdk_pixbuf_get_has_alpha (pixbuf)) {
+		GdkPixbuf *dest;
+	  
+		gdk_window_set_back_pixmap (drawing_area->window, NULL, FALSE);
+	  
+		dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, event->area.width, event->area.height);
+		
+		gdk_pixbuf_composite_color (pixbuf, dest,
+					    0, 0, event->area.width, event->area.height,
+					    -event->area.x, -event->area.y,
+					    (double) drawing_area->allocation.width / gdk_pixbuf_get_width (pixbuf),
+					    (double) drawing_area->allocation.height / gdk_pixbuf_get_height (pixbuf),
+					    GDK_INTERP_BILINEAR, 255,
+					    event->area.x, event->area.y, 16, 0xaaaaaa, 0x555555);
+		
+		gdk_draw_pixbuf (drawing_area->window, drawing_area->style->fg_gc[GTK_STATE_NORMAL], dest,
+				 0, 0, event->area.x, event->area.y,
+				 event->area.width, event->area.height,
+				 GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
+		
+		g_object_unref (dest);
+	} else {
+		gdk_draw_rgb_image (drawing_area->window,
+				    drawing_area->style->white_gc,
+				    event->area.x, event->area.y, 
+				    event->area.width, 
+				    event->area.height,
+				    GDK_RGB_DITHER_NORMAL,
+				    gdk_pixbuf_get_pixels (pixbuf)
+				    + (event->area.y * gdk_pixbuf_get_rowstride (pixbuf))
+				    + (event->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
+				    gdk_pixbuf_get_rowstride (pixbuf));
+	}
+}
+
+static void
+config_func (GtkWidget *drawing_area, GdkEventConfigure *event, gpointer data)
+{
+#if 0
+	GdkPixbuf *pixbuf;
+    
+	pixbuf = (GdkPixbuf *)g_object_get_data (G_OBJECT (drawing_area), "pixbuf");
+
+	if (((event->width) != gdk_pixbuf_get_width (pixbuf)) ||
+	    ((event->height) != gdk_pixbuf_get_height (pixbuf)))
+		gdk_pixbuf_scale (pixbuf, event->width, event->height);
+#endif
+}
+
+static GtkWidget*
+new_testrgb_window (GdkPixbuf *pixbuf, gchar *title)
+{
+	GtkWidget *window;
+	GtkWidget *vbox;
+	GtkWidget *temp_box;
+	GtkWidget *button;
+	GtkWidget *drawing_area;
+	gint w, h;
+
+        g_return_val_if_fail (pixbuf != NULL, NULL);
+	w = gdk_pixbuf_get_width (pixbuf);
+	h = gdk_pixbuf_get_height (pixbuf);
+
+	window = g_object_new (gtk_window_get_type (),
+				 "GtkObject::user_data", NULL,
+				 "GtkWindow::type", GTK_WINDOW_TOPLEVEL,
+				 "GtkWindow::title", title ? title : "testrgb",
+				 "GtkWindow::allow_shrink", TRUE,
+				 NULL);
+	g_signal_connect (window, "destroy",
+			  G_CALLBACK (quit_func), NULL);
+
+	vbox = gtk_vbox_new (FALSE, 0);
+
+	if (title)
+		gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (title),
+				    TRUE, TRUE, 0);
+
+	drawing_area = gtk_drawing_area_new ();
+
+	temp_box = gtk_hbox_new (FALSE, 0);
+	gtk_widget_set_size_request (GTK_WIDGET (drawing_area), w, h);
+	gtk_box_pack_start (GTK_BOX (temp_box), drawing_area, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), temp_box, FALSE, FALSE, 0);
+	
+
+	g_signal_connect (drawing_area, "expose_event",
+			  G_CALLBACK (expose_func), NULL);
+	g_signal_connect (drawing_area, "configure_event",
+			  G_CALLBACK (config_func), NULL);
+
+	g_object_set_data (G_OBJECT (drawing_area), "pixbuf", pixbuf);
+
+	gtk_widget_show (drawing_area);
+
+	button = gtk_button_new_with_label ("Quit");
+	gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+	g_signal_connect_swapped (button, "clicked",
+				  G_CALLBACK (gtk_widget_destroy), window);
+
+	gtk_widget_show (button);
+
+	gtk_container_add (GTK_CONTAINER (window), vbox);
+	gtk_widget_show_all (vbox);
+
+	gtk_widget_show (window);
+
+        return drawing_area;
+}
+
+
+static gint
+update_timeout (gpointer data)
+{
+        ProgressFileStatus *status = data;
+	gboolean done;
+        GError *error;
+        
+	done = FALSE;
+        error = NULL;
+
+	if (!feof (status->imagefile)) {
+		gint nbytes;
+                
+		nbytes = fread (status->buf, 1, status->readlen, 
+			       status->imagefile);
+
+
+                if (!gdk_pixbuf_loader_write (GDK_PIXBUF_LOADER (status->loader), status->buf, nbytes, &error)) {
+                        g_warning ("Error writing to loader: %s",
+                                   error->message);
+                        g_error_free (error);
+                        done = TRUE;
+                }
+                        
+                        
+        } 
+	else 
+                done = TRUE;
+	  
+	if (done) {
+                /* ignoring errors, we should not do that. */
+		gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader), NULL);
+		gtk_widget_queue_draw (*status->rgbwin);
+		g_object_unref (status->loader);
+		fclose (status->imagefile);
+		g_free (status->buf);
+	}
+
+	return !done;
+}
+
+
+static void
+progressive_prepared_callback (GdkPixbufLoader* loader, gpointer data)
+{
+        GtkWidget** retloc = data;
+        GdkPixbuf* pixbuf;
+
+        pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+
+        g_assert (pixbuf != NULL);
+
+        g_object_ref (pixbuf); /* for the RGB window */
+
+        *retloc = new_testrgb_window (pixbuf, "Progressive");
+
+        return;
+}
+
+
+static void
+progressive_updated_callback (GdkPixbufLoader* loader, guint x, guint y, guint width, guint height, gpointer data)
+{
+        GtkWidget** window_loc = data;
+
+        if (*window_loc != NULL)
+                gtk_widget_queue_draw_area (*window_loc,
+					   x, y, width, height);
+        return;
+}
+
+static int readlen = 4096;
+
+extern void pixbuf_init (void);
+
+void size_func (GdkPixbufLoader *loader, gint width, gint height, gpointer data)
+{
+        gdk_pixbuf_loader_set_size (loader, width*2, height*2);
+}
+
+
+int
+main (int argc, char **argv)
+{
+	int i;
+	int found_valid = FALSE;
+
+	GdkPixbuf *pixbuf;
+	GdkPixbufLoader *pixbuf_loader;
+
+	pixbuf_init ();
+
+	gtk_init (&argc, &argv);
+
+	/*	gdk_rgb_set_verbose (TRUE);*/
+
+	gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
+
+	{
+		char *tbf_readlen = getenv ("TBF_READLEN");
+		if (tbf_readlen) readlen = atoi (tbf_readlen);
+	}
+
+	{
+		char *tbf_bps = getenv ("TBF_KBPS");
+		guint bps;
+
+		if (tbf_bps) {
+			bps = atoi (tbf_bps);
+			g_print ("Simulating %d kBytes/sec\n", bps);
+			readlen = (bps*1024)/10;
+		}
+	}
+
+	i = 1;
+	if (argc == 1) {
+                const gchar*** xpmp;
+                GError *error = NULL;
+		
+		pixbuf = gdk_pixbuf_new_from_data (default_image, GDK_COLORSPACE_RGB, FALSE, 8,
+						   DEFAULT_WIDTH, DEFAULT_HEIGHT, DEFAULT_WIDTH * 3,
+						   NULL, NULL);
+		new_testrgb_window (pixbuf, NULL);
+
+                xpmp = xpms;
+                while (*xpmp) {
+                        pixbuf = gdk_pixbuf_new_from_xpm_data (*xpmp);
+                        new_testrgb_window (pixbuf, NULL);
+                        ++xpmp;
+                }
+
+                /* Test loading from inline data. */
+                pixbuf = gdk_pixbuf_new_from_inline (-1, apple_red, FALSE, &error);
+		if (!pixbuf)
+		  {
+		    fprintf (stderr, "failed to construct \"red apple\" pixbuf: %s\n",
+			     error->message);
+		    g_error_free (error);
+		  }
+		else
+		  new_testrgb_window (pixbuf, "Red apple from inlined RLE data");
+
+                pixbuf = gdk_pixbuf_new_from_inline (sizeof (gnome_foot), gnome_foot, TRUE, NULL);
+                new_testrgb_window (pixbuf, "GNOME Foot from inlined RLE data");
+                
+		found_valid = TRUE;
+	} else {
+		for (i = 1; i < argc; i++) {
+                        GError *error;
+
+                        error = NULL;
+			pixbuf = gdk_pixbuf_new_from_file (argv[i], &error);
+
+                        if (pixbuf == NULL) {
+                                g_warning ("Error loading image: %s",
+                                           error->message);
+                                g_error_free (error);
+                        }
+                        
+#if 0
+			pixbuf = gdk_pixbuf_rotate (pixbuf, 10.0);
+#endif
+
+			if (pixbuf) {
+				new_testrgb_window (pixbuf, "File");
+				found_valid = TRUE;
+			}
+		}
+#if 1	
+                {
+                        GtkWidget* rgb_window = NULL;
+			ProgressFileStatus   status;
+
+                        pixbuf_loader = gdk_pixbuf_loader_new ();
+			status.loader = pixbuf_loader;
+
+			status.rgbwin = &rgb_window;
+
+			status.buf = g_malloc (readlen);
+
+#if 0
+			g_signal_connect (pixbuf_loader, "size_prepared", 
+					  G_CALLBACK (size_func), NULL);
+#endif
+
+                        g_signal_connect (pixbuf_loader, "area_prepared",
+					  G_CALLBACK (progressive_prepared_callback),
+					  &rgb_window);
+                        g_signal_connect (pixbuf_loader, "area_updated",
+					  G_CALLBACK (progressive_updated_callback),
+					  &rgb_window);
+			
+                        status.imagefile = fopen (argv[1], "r");
+                        g_assert (status.imagefile != NULL);
+
+			status.readlen = readlen;
+
+                        status.timeout = gdk_threads_add_timeout (100, update_timeout, &status);
+                }
+#endif
+	}
+
+	if (found_valid)
+		gtk_main ();
+
+	return 0;
+}

docs/RELEASE-HOWTO

@@ -7,7 +7,6 @@ dependencies:
 * gtk-doc
 * docbook-utils
 Without those packages make distcheck will *not* pass.
-Make sure that gtk-doc is the latest released version.
 
 
  0) Go back to a pristine working directory. With git, this works:
@@ -26,21 +25,16 @@ Make sure that gtk-doc is the latest released version.
     committers, etc. Anybody who is mentioned in ChangeLog gets
     credits, but only real names, not email addresses or nicknames.
 
- 3) Update the pot files and commit the changes:
-
-    make -C po gtk30.pot
-    make -C po-properties gtk30-properties.pot
-
- 4) In particular, if this is a major, stable, release, verify that
+ 3) In particular, if this is a major, stable, release, verify that
     README.in contains the relevant release notes and that the
     required versions of dependencies in INSTALL.in are in sync
-    with configure.ac.
+    with configure.in.
 
- 5) Verify that the version in configure.ac has been bumped after the last
+ 4) Verify that the version in configure.in has been bumped after the last
     release. (Note that this is critical, a slip-up here will cause the
     soname to change).
 
- 6) Make sure that make check is happy (If you don't do it here, make distcheck
+ 5) Make sure that make check is happy (If you don't do it here, make distcheck
     will also catch it, but it is kind of disheartening to see make distcheck
     fail due to an extraneous symbol after watching it build the docs for an
     hour...).
@@ -54,7 +48,7 @@ Make sure that gtk-doc is the latest released version.
       using a function from a different library, which is not yet allowed
       by the filter in pltcheck.sh
 
- 7) If this is a devel release, make sure that the docs for new symbols
+ 6) If this is a devel release, make sure that the docs for new symbols
     are in good shape. Look at the -unused.txt files and add stuff found
     there to the corresponding -sections.txt file. Look at the
     -undocumented.txt files and see if there is anything in there that
@@ -63,12 +57,12 @@ Make sure that gtk-doc is the latest released version.
     Since: tags, and that there is an index in the main -docs.sgml for
     the next stable version.
 
- 8) make distcheck
+ 7) make distcheck
 
- 9) Fix broken stuff found by 8), commit changes: git commit -a, repeat.
+ 8) Fix broken stuff found by 7), repeat
 
-10) Once distcheck succeeds, verify that the tree is clean: git diff should
-    come up empty.
+ 9) Commit all changes: git commit -a. You will have a bunch of po file
+    changes, NEWS and maybe some doc changes too
 
 10) Now you've got the tarball. Check that the tarball size looks
     reasonable compared to previous releases. If the size goes down
@@ -83,7 +77,7 @@ Make sure that gtk-doc is the latest released version.
 
     git push origin refs/tags/2.12.10
 
-13) Bump the version number in configure.ac and commit and push this change
+13) Bump the version number in configure.in and commit and push this change
 
 14) Upload the tarball to master.gnome.org and run install-module to transfer
     it to download.gnome.org. If you don't have an account on master.gnome.org,
@@ -107,7 +101,7 @@ Make sure that gtk-doc is the latest released version.
     summary of changes.
 
 18) Send it to gnome-announce-list, gtk-list, gtk-app-devel-list and
-    gtk-devel-list. Set reply-to to desktop-devel-list.
+    gtk-devel-list. Set reply-to to gnome-hackers.
 
 19) Add a link to the release announcement to www.gtk.org which lives
-    in the gtk-web git module.
+    in the gtk-web cvs module.

docs/developers.txt

@@ -48,6 +48,15 @@ Events that are assured to have a valid GdkEvent.any.window field are
 GDK_EXPOSE		GtkWidget::expose_event
 
 
+gtk_widget_ref() vs. gtk_object_ref()
+-------------------------------------
+
+The widget referencing functions gtk_widget_ref() and gtk_widget_unref()
+are currently just wrappers about the corresponding referencing functions
+for objects. Still you should use the widget referencing functions if you
+are sure the referenced object is of type GTK_WIDGET_TYPE.
+
+
 Writing Gdk functions
 ---------------------
 

docs/dnd_internals.txt

@@ -62,6 +62,8 @@ used by anything other than the DND code in GTK+.
 /* Drag and Drop */
 
 GdkDragContext * gdk_drag_context_new        (void);
+void             gdk_drag_context_ref        (GdkDragContext *context);
+void             gdk_drag_context_unref      (GdkDragContext *context);
 
 These create and refcount GdkDragContexts in a
 straightforward manner.

docs/faq/Makefile.am

@@ -17,8 +17,6 @@ pdf:
 	  (cd $(srcdir); db2pdf gtk-faq.sgml); \
 	fi
 
-all-local: html
-
 dist-hook: html
 	cp -Rp $(srcdir)/html $(distdir)
 else

docs/faq/gtk-faq.sgml

@@ -789,7 +789,7 @@ disgrace to the widget set will gladly be included.</para>
 <para>The new widgets that get added to GTK+ are generally either
 replacements for existing widgets that are no longer
 deemed to be adequate, or have been developed externally to GTK+ but
-have been widely tested.</para>
+have been widely tested. 
 
 <para>Before you spend months of your valuable time implementing your
 revolutionary widget, it is highly recommended that you get some
@@ -996,11 +996,11 @@ relevant packages. These are:</para>
 or on any GNU mirror.</para>
 
 <para>In order to use the powerful autoconf/automake scheme,
-you must create a configure.ac which may look like:</para>
+you must create a configure.in which may look like:</para>
 
 <programlisting role="C">
 dnl Process this file with autoconf to produce a configure script.
-dnl configure.ac for a GTK+ based program
+dnl configure.in for a GTK+ based program
 
 AC_INIT(myprg.c)
 AM_INIT_AUTOMAKE(mypkgname, 0.0.1)
@@ -1137,7 +1137,8 @@ myapp --display=:1
      | | | +GtkCombo
      | | | `GtkStatusbar
      | | `GtkVBox
-     | |   `GtkColorSelection
+     | |   +GtkColorSelection
+     | |   `GtkGammaCurve
      | +GtkButton
      | | +GtkOptionMenu
      | | `GtkToggleButton
@@ -1159,6 +1160,7 @@ myapp --display=:1
      | +GtkToolbar
      | `GtkTree
      +GtkDrawingArea
+     | `GtkCurve
      +GtkEditable
      | +GtkEntry
      | | `GtkSpinButton
@@ -1627,7 +1629,11 @@ int main(int argc, char *argv[])
   g_signal_connect(G_OBJECT (window), "destroy",
 		     G_CALLBACK(destroy), NULL);
 
+#if (GTK_MAJOR_VERSION == 1) &amp;&amp; (GTK_MINOR_VERSION == 0)
+  gtk_container_border_width(GTK_CONTAINER (window), 10);
+#else  
   gtk_container_set_border_width(GTK_CONTAINER (window), 10);
+#endif
 
   /* add a button to do something useful */
   button = gtk_button_new_with_label("Fork me!");
@@ -1892,7 +1898,7 @@ not applied you'll have to use the
 function. <literal>gtk_object_class_user_signal_new</literal> allows you
 to add a new signal to a predefined GTK+ widget without any
 modification of the GTK+ source code. The new signal can be
-emited with <literal>g_signal_emit</literal> and can be
+emited with <literal>gtk_signal_emit</literal> and can be
 handled in the same way as other signals.</para>
 
 <para>Tim Janik posted this code snippet:</para>
@@ -1914,7 +1920,7 @@ gtk_widget_user_action (GtkWidget *widget,
 {
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  g_signal_emit (widget, signal_user_action, act_data);
+  gtk_signal_emit (GTK_OBJECT (widget), signal_user_action, act_data);
 }
 </programlisting>
 
@@ -2102,10 +2108,10 @@ not.</para>
 snippet:</para>
 
 <programlisting role="C">
-     g_object_ref(widget);
+     gtk_widget_ref(widget);
      gtk_container_remove(GTK_CONTAINER(old_parent), widget);
      gtk_container_add(GTK_CONTAINER(new_parent), widget);
-     g_object_unref(widget);
+     gtk_widget_unref(widget);
 </programlisting>
 
 </sect1>
@@ -2301,8 +2307,8 @@ used, as in:</para>
                NULL, gtk_widget_get_colormap(top),
                &amp;pixmap_mask, NULL, pixfile);
   pixw = gtk_pixmap_new (pixmap, pixmap_mask);
-  g_object_unref (pixmap);
-  g_object_unref (pixmap_mask);
+  gdk_pixmap_unref (pixmap);
+  gdk_pixmap_unref (pixmap_mask);
 </programlisting>
 
 </sect1>
@@ -2521,15 +2527,15 @@ using the following expression:</para>
 
 <para>If you don't want the user to be able to modify the
 content of this entry, you can use the
-gtk_editable_set_editable() function:</para>
+gtk_entry_set_editable() function:</para>
 
 
 <programlisting role="C">
-void gtk_editable_set_editable (GtkEditable *editable,
-                                gboolean     is_editable);
+      void gtk_entry_set_editable(GtkEntry *entry, 
+                                  gboolean editable);
 </programlisting>
 
-<para>Set the is_editable parameter to FALSE to disable typing
+<para>Set the editable parameter to FALSE to disable typing
 into the entry.</para>
 </sect1>
 
@@ -2553,10 +2559,10 @@ into the entry.</para>
 signal handler with</para>
 
 <programlisting role="C">
-      g_signal_connect(GTK_COMBO(cb)->entry,
-                       "changed",
-                       G_CALLBACK(my_cb_change_handler),
-                       NULL);
+      gtk_signal_connect(GTK_COMBO(cb)->entry,
+                         "changed",
+                         GTK_SIGNAL_FUNC(my_cb_change_handler),
+                         NULL);
 </programlisting>
 
 </sect1>
@@ -2623,8 +2629,8 @@ underlined, and the relevant accelerators are created.</para>
   gtk_box_pack_start (GTK_BOX (vbox1), menubar1, FALSE, FALSE, 0);
 
   file1 = gtk_menu_item_new_with_label ("");
-  gtk_label_set_use_underline (GTK_LABEL (gtk_bin_get_child (GTK_BIN (file1))),
-                               TRUE);
+  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (file1)->child),
+                                   _("_File"));
   gtk_widget_add_accelerator (file1, "activate_item", accel_group,
                               tmp_key, GDK_MOD1_MASK, 0);
   gtk_object_set_data (GTK_OBJECT (window1), "file1", file1);
@@ -2637,8 +2643,8 @@ underlined, and the relevant accelerators are created.</para>
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (file1), file1_menu);
 
   new1 = gtk_menu_item_new_with_label ("");
-  gtk_label_set_use_underline (GTK_LABEL (gtk_bin_get_child (GTK_BIN (new1))),
-                               TRUE);
+  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (new1)->child),
+                                   _("_New"));
   gtk_widget_add_accelerator (new1, "activate_item", file1_menu_accels,
                               tmp_key, 0, 0);
   gtk_object_set_data (GTK_OBJECT (window1), "new1", new1);
@@ -2664,9 +2670,9 @@ GtkMenuItem with:</para>
       /* do stuff with child */
       if (GTK_IS_LABEL (child))
       {
-        const gchar *text;
+        gchar *text;
     
-        text = gtk_label_get_text (GTK_LABEL (child));
+        gtk_label_get (GTK_LABEL (child), &amp;text);
         g_print ("menu item text: %s\n", text);
       }
     }
@@ -2858,9 +2864,9 @@ be:</para>
 
 <programlisting role="C">
   entry = gtk_entry_new();
-  g_signal_connect (entry, "activate",
-                    G_CALLBACK(entry_callback),
-                    NULL);
+  gtk_signal_connect (GTK_OBJECT(entry), "activate",
+                      GTK_SIGNAL_FUNC(entry_callback),
+                      NULL);
 </programlisting>
 
 </sect1>
@@ -3038,8 +3044,8 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (window), text);
 
   /* connect after everything else */
-  g_signal_connect_after (text, "button_press_event",
-                          G_CALLBACK (insert_bar), NULL);
+  gtk_signal_connect_after (GTK_OBJECT(text), "button_press_event",
+    GTK_SIGNAL_FUNC (insert_bar), NULL);
 
   gtk_widget_show_all(window);
   gtk_main();
@@ -3102,7 +3108,7 @@ like this:</para>
   gc = gdk_gc_new(widget->window);
 
   /* find proper dimensions for rectangle */
-  gdk_drawable_get_size(widget->window, &amp;width, &amp;height);
+  gdk_window_get_size(widget->window, &amp;width, &amp;height);
 
   /* the color we want to use */
   color = (GdkColor *)malloc(sizeof(GdkColor));
@@ -3124,7 +3130,7 @@ like this:</para>
    * displays. Therefore, this call is required so that GDK and X can
    * give us the closest color available in the colormap
    */
-  gdk_colormap_alloc_color(gtk_widget_get_colormap(widget), color, FALSE, TRUE);
+  gdk_color_alloc(gtk_widget_get_colormap(widget), color);
 
   /* set the foreground to our color */
   gdk_gc_set_foreground(gc, color);

docs/gtk-config.txt

@@ -152,10 +152,10 @@ and the AM_PATH_GTK macro. The program used here is the testinput.c
 You should first read the introductory portions of the automake
 Manual, if you are not already familiar with it.
 
-Two files are needed, 'configure.ac', which is used to build the
+Two files are needed, 'configure.in', which is used to build the
 configure script:
 
-==configure.ac===
+==configure.in===
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(testinput.c)
 

docs/refcounting.txt

@@ -197,7 +197,7 @@ GtkOptionMenu looks like this:
   /* menu_item->ref_count == 1 and it is flagged as `floating'.
    */
 
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+  gtk_menu_append (GTK_MENU (menu), menu_item);
   /* menu_item->ref_count still == 1, but it is no longer `floating'.
    */
   
@@ -250,12 +250,12 @@ Example code sequences that require reference wraps:
    /* gtk_container_remove() will unparent the child and therefore
     * cause its reference count to be decremented by one.
     */
-   g_object_ref (widget);
+   gtk_widget_ref (widget);
    gtk_container_remove (container, widget);
    /* without the reference count, the widget would have been destroyed here.
    */
    gtk_container_add (container, widget);
-   g_object_unref (widget);
+   gtk_widget_unref (widget);
 
 
   /* all items in item_list need to be referenced
@@ -267,7 +267,7 @@ Example code sequences that require reference wraps:
    slist = NULL;
    for (list = item_list; list; list = list->next)
    {
-     g_object_ref (GTK_WIDGET (list->data));
+     gtk_widget_ref (GTK_WIDGET (list->data));
      slist = g_slist_prepend (slist, list->data);
    }
    gtk_list_remove_items (list, item_list);
@@ -280,7 +280,7 @@ Example code sequences that require reference wraps:
      
      tmp = slist;
      slist = slist->next;
-     g_object_unref (GTK_WIDGET (tmp->data));
+     gtk_widget_unref (GTK_WIDGET (tmp->data));
      g_slist_free_1 (tmp);
    }
    

docs/reference/Makefile.am

@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = gdk gtk libgail-util
+SUBDIRS = gdk-pixbuf gdk gtk libgail-util
 
 GITIGNOREFILES = */*.1
 

docs/reference/gdk-pixbuf/Makefile.am

@@ -0,0 +1,99 @@
+## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/Makefile.decl
+
+AUTOMAKE_OPTIONS = 1.6
+
+# The name of the module.
+DOC_MODULE=gdk-pixbuf
+
+# The top-level SGML file.
+DOC_MAIN_SGML_FILE=gdk-pixbuf.sgml
+
+# Extra options to supply to gtkdoc-scan
+SCAN_OPTIONS=--source-dir=../../../contrib/gdk-pixbuf-xlib --deprecated-guards="GDK_PIXBUF_ENABLE_BROKEN|GDK_PIXBUF_DISABLE_DEPRECATED"
+
+# The directory containing the source code. Relative to $(srcdir)
+DOC_SOURCE_DIR=../../../gdk-pixbuf
+
+# Used for dependencies
+HFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.h $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.h
+CFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.c $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.c
+
+# Header files to ignore when scanning
+IGNORE_HFILES=				\
+	pixops				\
+	gdk-pixbuf-alias.h		\
+	gdk-pixbuf-marshal.h		\
+	gdk-pixbuf-xlib-private.h 	\
+	gdk-pixbuf-i18n.h 		\
+	gdk-pixbuf-private.h		\
+	io-gif-animation.h		\
+	io-ani-animation.h		\
+	xpm-color-table.h		\
+	test-images.h
+
+INCLUDES = 			\
+	-I$(top_srcdir) 	\
+	-I$(top_builddir) 	\
+	-I$(top_builddir)/gdk	\
+	$(GTK_DEBUG_FLAGS)	\
+	$(GTK_DEP_CFLAGS)
+
+GTKDOC_LIBS = \
+	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la	\
+	$(top_builddir)/gdk/$(gdktargetlib)        			\
+	$(top_builddir)/gtk/$(gtktargetlib) 				\
+	$(GTK_DEP_LIBS)
+
+
+# Extra options to supply to gtkdoc-mkdb
+MKDB_OPTIONS=--main-sgml-file=$(DOC_MAIN_SGML_FILE) --sgml-mode --source-dir=../../../contrib/gdk-pixbuf-xlib --output-format=xml --name-space=gdk_pixbuf
+
+# Extra SGML files that are included by DOC_MAIN_SGML_FILE
+content_files =				\
+	version.xml			\
+	gdk-pixbuf-from-drawables.sgml	\
+	gdk-pixbuf-rendering.sgml	\
+	gdk-pixbuf.sgml			\
+	porting-from-imlib.sgml		\
+	gdk-pixbuf-csource.xml		\
+	gdk-pixbuf-query-loaders.xml
+
+# Images to copy into HTML directory
+HTML_IMAGES = composite.png
+
+# Extra options to supply to gtkdoc-fixref
+FIXXREF_OPTIONS= --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib
+
+
+include $(top_srcdir)/gtk-doc.make
+
+# Other files to distribute
+EXTRA_DIST += version.xml.in \
+	composite.png \
+	composite.dia \
+	apple-red-1a.png \
+	apple-red-2c.png \
+	gnome-gmush-1.png
+
+########################################################################
+
+if ENABLE_MAN
+
+man_MANS = gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 
+
+%.1 : %.xml 
+	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+BUILT_EXTRA_DIST = $(man_MANS)
+
+endif
+
+dist-hook-local: $(BUILT_EXTRA_DIST)
+	files='$(BUILT_EXTRA_DIST)';				\
+	for f in $$files; do					\
+	  if test -f $$f; then d=.; else d=$(srcdir); fi;	\
+	  cp $$d/$$f $(distdir) || exit 1; done
+
+-include $(top_srcdir)/git.mk

docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml

@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gdk-pixbuf-csource">
+
+<refmeta>
+<refentrytitle>gdk-pixbuf-csource</refentrytitle>
+<manvolnum>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+<refname>gdk-pixbuf-csource</refname>
+<refpurpose>C code generation utility for GdkPixbuf images</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gdk-pixbuf-csource</command>
+<arg choice="opt">options</arg>
+<arg choice="opt">image</arg>
+</cmdsynopsis>
+<cmdsynopsis>
+<command>gdk-pixbuf-csource</command>
+<arg choice="opt">options</arg>
+<arg choice="plain">--build-list</arg>
+<arg rep="repeat">
+  <arg>name</arg>
+  <arg>image</arg>
+</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gdk-pixbuf-csource</command> is a small utility that generates C code
+containing images, useful for compiling images directly into programs.
+</para>
+</refsect1>
+
+<refsect1><title>Invocation</title>
+<para>
+<command>gdk-pixbuf-csource</command> either takes as input one image file name
+to generate code for, or, using the <option>--build-list</option> option, a 
+list of (<replaceable>name</replaceable>, <replaceable>image</replaceable>)
+pairs to generate code for a list of images into named variables.
+</para>
+<refsect2><title>Options</title>
+<variablelist>
+
+<varlistentry>
+<term><option>--stream</option></term>
+<listitem><para>
+Generate pixbuf data stream (a single string containing a serialized
+<structname>GdkPixdata</structname> structure in network byte order).
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--struct</option></term>
+<listitem><para>
+Generate GdkPixdata structure (needs the <structname>GdkPixdata</structname>
+structure definition from <filename>gdk-pixdata.h</filename>).
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--macros</option></term>
+<listitem><para>
+Generate *_ROWSTRIDE, *_WIDTH, *_HEIGHT, *_BYTES_PER_PIXEL and
+*_RLE_PIXEL_DATA or *_PIXEL_DATA macro definitions for the image.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--rle</option></term>
+<listitem><para>
+Enables run-length encoding for the generated pixel data (default).
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--raw</option></term>
+<listitem><para>
+Disables run-length encoding for the generated pixel data.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--extern</option></term>
+<listitem><para>
+Generate extern symbols.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--static</option></term>
+<listitem><para>
+Generate static symbols (default).
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--decoder</option></term>
+<listitem><para>
+Provide a *_RUN_LENGTH_DECODE(image_buf, rle_data, size, bpp) macro definition
+to decode run-length encoded image data.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--name=identifier</option></term>
+<listitem><para>
+Specifies the identifier name (prefix) for the generated variables or
+macros (useful only if <option>--build-list</option> was not specified).
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--build-list</option></term>
+<listitem><para>
+Enables (<replaceable>name</replaceable>, <replaceable>image</replaceable>)
+pair parsing mode.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>-h</option>, <option>--help</option></term>
+<listitem><para>
+Print brief help and exit.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>-v</option>, <option>--version</option></term>
+<listitem><para>
+Print version and exit.
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
+<term><option>--g-fatal-warnings</option></term>
+<listitem><para>
+Make warnings fatal (causes the program to abort).
+</para></listitem>
+</varlistentry>
+
+</variablelist>
+</refsect2>
+</refsect1>
+
+<refsect1><title>See also</title>
+<para>
+The <structname>GdkPixbuf</structname> documentation, shipped with the 
+Gtk+ distribution, available from <ulink url="http://www.gtk.org">www.gtk.org</ulink>.
+</para>
+</refsect1>
+
+<refsect1><title>Bugs</title>
+<para>
+The runlength encoder gets out of sync with the pixel boundaries, since
+it includes the rowstride padding in the encoded stream. Furthermore, it
+generates pixbufs with suboptimal rowstride in some cases.
+</para>
+</refsect1>
+
+<refsect1><title>Author</title>
+<para>
+<command>gdk-pixbuf-csource</command> was written by Tim Janik
+<email>timj@gtk.org</email>. 
+</para>
+<para>
+This manual page was provided by Tim Janik <email>timj@gtk.org</email>. 
+</para>
+</refsect1>
+</refentry>
+

docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.sgml

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gdk-pixbuf-gdk-pixbuf-from-drawables">
+<refmeta>
+<refentrytitle>Drawables to Pixbufs</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>GDK-PIXBUF Library</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+<refname>Drawables to Pixbufs</refname><refpurpose>Getting parts of a GDK drawable's image data into a pixbuf.</refpurpose>
+</refnamediv>
+
+<refsect1>
+<title>Description</title>
+  <para>
+    The functions to take the image data from a GDK drawable and dump it 
+    into a pixbuf are contained in GDK, see the 
+    <link linkend="gdk-Pixbufs">Pixbufs</link> section of the GDK 
+    documentation.
+  </para>
+</refsect1>
+
+
+
+
+</refentry>

docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gdk-pixbuf-query-loaders">
+
+<refmeta>
+<refentrytitle>gdk-pixbuf-query-loaders</refentrytitle>
+<manvolnum>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+<refname>gdk-pixbuf-query-loaders</refname>
+<refpurpose>GdkPixbuf loader registration utility</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gdk-pixbuf-query-loaders</command>
+<arg choice="opt" rep="repeat">module</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gdk-pixbuf-query-loaders</command> collects information about loadable
+modules for <application>gdk-pixbuf</application> and writes it to <filename>stdout</filename>. 
+</para>
+<para>
+If called without arguments, it looks for modules in the
+<application>gdk-pixbuf</application> loader directory.  
+</para>
+<para>
+If called with arguments, it looks for the specified modules. The arguments
+may be absolute or relative paths.
+</para>
+</refsect1>
+
+<refsect1><title>Environment</title>
+<para>
+The environment variable <envar>GDK_PIXBUF_MODULEDIR</envar> can be used
+to specify a different loader directory. The default <application>gdk-pixbuf</application> loader
+directory is <filename><replaceable>libdir</replaceable>/gtk-2.0/<replaceable>version</replaceable>/loaders</filename>.
+</para>
+</refsect1>
+
+<refsect1><title>Bugs</title>
+<para>
+None known yet.
+</para>
+</refsect1>
+
+</refentry>
+
+

docs/reference/gdk-pixbuf/gdk-pixbuf-rendering.sgml

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gdk-pixbuf-gdk-pixbuf-rendering">
+<refmeta>
+<refentrytitle>Rendering</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>GDK-PIXBUF Library</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+<refname>Rendering</refname><refpurpose>Rendering a pixbuf to a GDK drawable.</refpurpose>
+</refnamediv>
+
+
+<refsect1>
+<title>Description</title>
+  <para>
+    The functions to render pixbufs to GDK drawables are contained in 
+    GDK, see the <link linkend="gdk-Pixbufs">Pixbufs</link> section 
+    of the GDK documentation.
+  </para>
+</refsect1>
+
+
+
+
+</refentry>
+
+
+

docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt

@@ -0,0 +1,302 @@
+<INCLUDE>gdk-pixbuf/gdk-pixbuf.h</INCLUDE>
+
+<SECTION>
+<TITLE>Versioning</TITLE>
+<FILE>initialization_versions</FILE>
+
+<SUBSECTION>
+gdk_pixbuf_version
+gdk_pixbuf_major_version
+gdk_pixbuf_minor_version
+gdk_pixbuf_micro_version
+GDK_PIXBUF_VERSION
+GDK_PIXBUF_MAJOR
+GDK_PIXBUF_MINOR
+GDK_PIXBUF_MICRO
+
+<SUBSECTION Private>
+GDK_PIXBUF_VAR
+</SECTION>
+
+<SECTION>
+<FILE>gdk-pixbuf</FILE>
+GdkPixbufError
+GDK_PIXBUF_ERROR
+GdkColorspace
+GdkPixbufAlphaMode
+GdkPixbuf
+gdk_pixbuf_get_colorspace
+gdk_pixbuf_get_n_channels
+gdk_pixbuf_get_has_alpha
+gdk_pixbuf_get_bits_per_sample
+gdk_pixbuf_get_pixels
+gdk_pixbuf_get_width
+gdk_pixbuf_get_height
+gdk_pixbuf_get_rowstride
+gdk_pixbuf_get_option
+
+<SUBSECTION Standard>
+GDK_TYPE_PIXBUF_ERROR
+GDK_TYPE_COLORSPACE
+GDK_TYPE_PIXBUF_ALPHA_MODE
+GDK_PIXBUF
+GDK_TYPE_PIXBUF
+GDK_IS_PIXBUF
+
+
+<SUBSECTION Private>
+gdk_pixbuf_get_type
+gdk_pixbuf_error_quark
+gdk_colorspace_get_type
+gdk_pixbuf_alpha_mode_get_type
+gdk_pixbuf_error_get_type
+</SECTION>
+
+<SECTION>
+<FILE>refcounting</FILE>
+gdk_pixbuf_ref
+gdk_pixbuf_unref
+GdkPixbufDestroyNotify
+</SECTION>
+
+<SECTION>
+<FILE>file-loading</FILE>
+gdk_pixbuf_new_from_file
+gdk_pixbuf_new_from_file_at_size
+gdk_pixbuf_new_from_file_at_scale
+gdk_pixbuf_get_file_info
+gdk_pixbuf_new_from_stream
+gdk_pixbuf_new_from_stream_at_scale
+</SECTION>
+
+<SECTION>
+<FILE>file-saving</FILE>
+gdk_pixbuf_savev
+gdk_pixbuf_save
+GdkPixbufSaveFunc
+gdk_pixbuf_save_to_callback
+gdk_pixbuf_save_to_callbackv
+gdk_pixbuf_save_to_buffer
+gdk_pixbuf_save_to_bufferv
+gdk_pixbuf_save_to_stream
+</SECTION>
+
+<SECTION>
+<FILE>creating</FILE>
+gdk_pixbuf_new
+gdk_pixbuf_new_from_data
+gdk_pixbuf_new_from_xpm_data
+gdk_pixbuf_new_from_inline
+gdk_pixbuf_new_subpixbuf
+gdk_pixbuf_copy
+</SECTION>
+
+<SECTION>
+<INCLUDE>gdk-pixbuf/gdk-pixdata.h</INCLUDE>
+<FILE>inline</FILE>
+GdkPixdata
+GdkPixdataType
+GdkPixdataDumpType
+GDK_PIXBUF_MAGIC_NUMBER
+GDK_PIXDATA_HEADER_LENGTH
+gdk_pixdata_from_pixbuf
+gdk_pixbuf_from_pixdata
+gdk_pixdata_serialize
+gdk_pixdata_deserialize
+gdk_pixdata_to_csource
+</SECTION>
+
+<SECTION>
+<FILE>util</FILE>
+gdk_pixbuf_add_alpha
+gdk_pixbuf_copy_area
+gdk_pixbuf_saturate_and_pixelate
+gdk_pixbuf_apply_embedded_orientation
+gdk_pixbuf_fill
+</SECTION>
+
+<SECTION>
+<FILE>animation</FILE>
+GdkPixbufAnimation
+GdkPixbufAnimationIter
+gdk_pixbuf_animation_new_from_file
+gdk_pixbuf_animation_ref
+gdk_pixbuf_animation_unref
+gdk_pixbuf_animation_get_width
+gdk_pixbuf_animation_get_height
+gdk_pixbuf_animation_get_iter
+gdk_pixbuf_animation_is_static_image
+gdk_pixbuf_animation_get_static_image
+gdk_pixbuf_animation_iter_advance
+gdk_pixbuf_animation_iter_get_delay_time
+gdk_pixbuf_animation_iter_on_currently_loading_frame
+gdk_pixbuf_animation_iter_get_pixbuf
+
+<SUBSECTION>
+GdkPixbufSimpleAnim
+gdk_pixbuf_simple_anim_new
+gdk_pixbuf_simple_anim_add_frame
+gdk_pixbuf_simple_anim_set_loop
+gdk_pixbuf_simple_anim_get_loop
+
+<SUBSECTION Standard>
+GDK_PIXBUF_ANIMATION
+GDK_TYPE_PIXBUF_ANIMATION
+GDK_IS_PIXBUF_ANIMATION
+GDK_IS_PIXBUF_ANIMATION_ITER
+GDK_PIXBUF_ANIMATION_ITER
+GDK_TYPE_PIXBUF_ANIMATION_ITER
+
+GDK_PIXBUF_SIMPLE_ANIM_GET_CLASS
+GDK_IS_PIXBUF_SIMPLE_ANIM
+GDK_PIXBUF_SIMPLE_ANIM_CLASS
+GDK_IS_PIXBUF_SIMPLE_ANIM_CLASS
+GDK_TYPE_PIXBUF_SIMPLE_ANIM
+GDK_PIXBUF_SIMPLE_ANIM
+GDK_TYPE_PIXBUF_SCALED_ANIM
+GDK_TYPE_PIXBUF_SCALED_ANIM_ITER
+<SUBSECTION Private>
+gdk_pixbuf_non_anim_new
+
+gdk_pixbuf_animation_get_type
+gdk_pixbuf_animation_iter_get_type
+
+gdk_pixbuf_simple_anim_get_type
+gdk_pixbuf_simple_anim_iter_get_type
+GdkPixbufSimpleAnimClass
+gdk_pixbuf_scaled_anim_get_type
+gdk_pixbuf_scaled_anim_iter_get_type
+GdkPixbufScaledAnimClass
+GdkPixbufScaledAnim
+</SECTION>
+
+<SECTION>
+<FILE>scaling</FILE>
+GdkInterpType
+gdk_pixbuf_scale_simple
+gdk_pixbuf_scale
+gdk_pixbuf_composite_color_simple
+gdk_pixbuf_composite
+gdk_pixbuf_composite_color
+GdkPixbufRotation
+gdk_pixbuf_rotate_simple
+gdk_pixbuf_flip
+
+<SUBSECTION Standard>
+GDK_TYPE_INTERP_TYPE
+GDK_TYPE_PIXBUF_ROTATION
+
+<SUBSECTION Private>
+gdk_interp_type_get_type
+gdk_pixbuf_rotation_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gdk-pixbuf-loader</FILE>
+<TITLE>GdkPixbufLoader</TITLE>
+GdkPixbufLoader
+gdk_pixbuf_loader_new
+gdk_pixbuf_loader_new_with_type
+gdk_pixbuf_loader_new_with_mime_type
+gdk_pixbuf_loader_get_format
+gdk_pixbuf_loader_write
+gdk_pixbuf_loader_set_size
+gdk_pixbuf_loader_get_pixbuf
+gdk_pixbuf_loader_get_animation
+gdk_pixbuf_loader_close
+<SUBSECTION Standard>
+GDK_PIXBUF_LOADER
+GDK_PIXBUF_LOADER_GET_CLASS
+GDK_TYPE_PIXBUF_LOADER
+GDK_IS_PIXBUF_LOADER
+GDK_PIXBUF_LOADER_CLASS
+GDK_IS_PIXBUF_LOADER_CLASS
+<SUBSECTION Private>
+GdkPixbufLoaderClass
+gdk_pixbuf_loader_get_type
+</SECTION>
+
+<SECTION>
+<TITLE>Module Interface</TITLE>
+<FILE>module_interface</FILE>
+gdk_pixbuf_set_option
+gdk_pixbuf_get_formats
+gdk_pixbuf_format_get_name
+gdk_pixbuf_format_get_description
+gdk_pixbuf_format_get_mime_types
+gdk_pixbuf_format_get_extensions
+gdk_pixbuf_format_is_writable
+gdk_pixbuf_format_is_scalable
+gdk_pixbuf_format_is_disabled
+gdk_pixbuf_format_set_disabled
+gdk_pixbuf_format_get_license
+GdkPixbufFormat
+GdkPixbufFormatFlags
+GdkPixbufModulePattern
+GdkPixbufModuleFillVtableFunc
+GdkPixbufModuleFillInfoFunc
+GdkPixbufModuleSizeFunc
+GdkPixbufModulePreparedFunc
+GdkPixbufModuleUpdatedFunc
+GdkPixbufModule
+
+<SUBSECTION Animation>
+GdkPixbufAnimationClass
+GdkPixbufAnimationIterClass
+
+<SUBSECTION Standard>
+GDK_PIXBUF_ANIMATION_GET_CLASS
+GDK_IS_PIXBUF_ANIMATION_ITER_CLASS
+GDK_PIXBUF_ANIMATION_ITER_CLASS
+GDK_IS_PIXBUF_ANIMATION_CLASS
+GDK_PIXBUF_ANIMATION_ITER_GET_CLASS
+GDK_PIXBUF_ANIMATION_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>gdk-pixbuf-xlib-init</FILE>
+gdk_pixbuf_xlib_init
+gdk_pixbuf_xlib_init_with_depth
+</SECTION>
+
+<SECTION>
+<FILE>gdk-pixbuf-xlib-rendering</FILE>
+gdk_pixbuf_xlib_render_threshold_alpha
+gdk_pixbuf_xlib_render_to_drawable
+gdk_pixbuf_xlib_render_to_drawable_alpha
+gdk_pixbuf_xlib_render_pixmap_and_mask
+</SECTION>
+
+<SECTION>
+<FILE>gdk-pixbuf-xlib-from-drawables</FILE>
+gdk_pixbuf_xlib_get_from_drawable
+</SECTION>
+
+<SECTION>
+<FILE>gdk-pixbuf-xlib-rgb</FILE>
+XlibRgbCmap
+XlibRgbDither
+xlib_rgb_init
+xlib_rgb_init_with_depth
+xlib_rgb_xpixel_from_rgb
+xlib_rgb_gc_set_foreground
+xlib_rgb_gc_set_background
+xlib_draw_rgb_image
+xlib_draw_rgb_image_dithalign
+xlib_draw_rgb_32_image
+xlib_draw_gray_image
+xlib_rgb_cmap_new
+xlib_rgb_cmap_free
+xlib_draw_indexed_image
+xlib_rgb_ditherable
+xlib_rgb_set_verbose
+xlib_rgb_set_install
+xlib_rgb_set_min_colors
+xlib_rgb_get_cmap
+xlib_rgb_get_visual
+xlib_rgb_get_visual_info
+xlib_rgb_get_depth
+xlib_rgb_get_display
+xlib_rgb_get_screen
+</SECTION>
+