[gtk+/quartz-integration: 79/264] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 79/264] Merge branch 'master' into quartz-integration
- Date: Thu, 6 Jan 2011 22:24:55 +0000 (UTC)
commit 8caf72094f2edabe79cd2fe6adca66b7e6ef1efc
Merge: ec2c81b c874bba
Author: John Ralls <jralls ceridwen us>
Date: Mon Jan 3 23:21:07 2011 -0800
Merge branch 'master' into quartz-integration
Makefile.am | 7 +-
Makefile.decl | 10 +-
README.win32 | 2 +-
configure.ac | 198 ++++----
docs/reference/gdk/Makefile.am | 1 -
docs/reference/gdk/gdk3-sections.txt | 8 -
docs/reference/gtk/Makefile.am | 9 +-
docs/reference/gtk/building.sgml | 56 ++-
...der-convert-3.0.xml => gtk-builder-convert.xml} | 10 +-
docs/reference/gtk/gtk-docs.sgml | 4 +-
...con-cache-3.0.xml => gtk-update-icon-cache.xml} | 14 +-
docs/reference/gtk/gtk3-sections.txt | 1 +
docs/reference/libgail-util/Makefile.am | 1 -
gdk-3.0.pc.in | 2 +-
gdk/Makefile.am | 21 +-
gdk/gdk.symbols | 3 -
gdk/gdkdevice.c | 32 +-
gdk/gdkdisplay.c | 448 +-----------------
gdk/gdkdisplay.h | 85 ----
gdk/gdkdisplayprivate.h | 2 -
gdk/gdkwindow.c | 22 +-
gdk/gdkwindow.h | 33 --
gdk/tests/Makefile.am | 4 +-
gdk/x11/gdkdisplay-x11.c | 8 +-
gdk/x11/gdkdisplay-x11.h | 1 +
gdk/x11/gdkscreen-x11.c | 23 +-
gtk+-3.0-uninstalled.pc.in | 6 +-
gtk+-3.0.pc.in | 2 +-
gtk+-unix-print-3.0.pc.in | 2 +-
gtk/Makefile.am | 36 +-
...gtk-builder-convert-3.0 => gtk-builder-convert} | 0
gtk/gtk.symbols | 1 +
gtk/gtkaboutdialog.c | 10 +-
gtk/gtkassistant.c | 60 ++--
gtk/gtkcellview.c | 4 +-
gtk/gtkcolorbutton.c | 271 ++++++------
gtk/gtkcolorbutton.h | 17 +-
gtk/gtkcssprovider.c | 8 +
gtk/gtkdialog.c | 8 +-
gtk/gtkdnd-quartz.c | 11 +-
gtk/gtkdnd.c | 13 +-
gtk/gtkdrawingarea.c | 4 +-
gtk/gtkentry.c | 17 +-
gtk/gtkentrycompletion.c | 11 +-
gtk/gtkenums.h | 2 +
gtk/gtkexpander.c | 2 -
gtk/gtkfilechooserbutton.c | 11 +-
gtk/gtkfilechooserdefault.c | 23 +-
gtk/gtkfixed.c | 4 +-
gtk/gtkhandlebox.c | 12 +-
gtk/gtkinvisible.c | 10 +-
gtk/gtklinkbutton.c | 8 +-
gtk/gtkmessagedialog.c | 17 +-
gtk/gtkmisc.c | 4 -
gtk/gtknotebook.c | 4 +-
gtk/gtkoffscreenwindow.c | 5 +-
gtk/gtkpaned.c | 2 -
gtk/gtkpathbar.c | 12 +-
gtk/gtkplug.c | 5 +-
gtk/gtkprintbackend.h | 8 +-
gtk/gtkprinter.c | 22 +-
gtk/gtkprintunixdialog.c | 4 +-
gtk/gtkradiobutton.c | 2 +-
gtk/gtkrecentchooserdefault.c | 6 +-
gtk/gtkselection.c | 23 +
gtk/gtkselection.h | 4 +
gtk/gtkseparatortoolitem.c | 2 -
gtk/gtksizerequest.c | 2 -
gtk/gtksocket.c | 5 +-
gtk/gtkspinbutton.c | 16 +-
gtk/gtkstylecontext.h | 15 +
gtk/gtkswitch.c | 2 -
gtk/gtktextbtree.c | 47 +-
gtk/gtktextbuffer.c | 9 +-
gtk/gtktextbufferserialize.c | 15 +-
gtk/gtktextlayout.c | 10 +-
gtk/gtktexttag.c | 492 ++++++++++----------
gtk/gtktexttag.h | 54 +--
gtk/gtktexttagprivate.h | 54 +++
gtk/gtktexttagtable.c | 29 +-
gtk/gtktoolbar.c | 4 +-
gtk/gtktoolbutton.c | 8 +-
gtk/gtktoolitem.c | 2 -
gtk/gtktoolpalette.c | 5 +-
gtk/gtktooltip.c | 60 ++-
gtk/gtktrayicon-x11.c | 28 +-
gtk/gtkwidget.c | 16 +-
gtk/gtkwin32embedwidget.c | 4 +-
gtk/gtkwindow.c | 6 +-
gtk/tests/Makefile.am | 8 +-
modules/input/Makefile.am | 4 +-
modules/other/gail/libgail-util/gailmisc.c | 308 ++++++++-----
modules/printbackends/cups/gtkprintbackendcups.c | 28 +-
modules/printbackends/cups/gtkprintercups.c | 10 +-
modules/printbackends/file/gtkprintbackendfile.c | 64 +++-
tests/Makefile.am | 1 +
tests/gradient1.png | Bin 0 -> 722 bytes
tests/styleexamples.c | 83 ++--
98 files changed, 1426 insertions(+), 1641 deletions(-)
---
diff --cc gtk/Makefile.am
index cefc2eb,215f305..00d7dc3
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@@ -54,10 -54,9 +54,8 @@@ INCLUDES =
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \
$(GTK_DEP_CFLAGS) \
- $(gtk_clipboard_dnd_c_sources_CFLAGS) \
$(INCLUDED_IMMODULE_DEFINE)
- gtarget=$(gdktarget)
-
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
