[gtk+/gdk-backend-wayland: 103/105] Merge remote-tracking branch 'origin/master' into gdk-backend-wayland
- From: Kristian Høgsberg <krh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gdk-backend-wayland: 103/105] Merge remote-tracking branch 'origin/master' into gdk-backend-wayland
- Date: Tue, 1 Mar 2011 16:34:32 +0000 (UTC)
commit 287d91e5f994d059232731133870ba9e95c8e418
Merge: b513461 f04504a
Author: Kristian Høgsberg <krh bitplanet net>
Date: Sat Feb 26 14:44:29 2011 -0500
Merge remote-tracking branch 'origin/master' into gdk-backend-wayland
Conflicts:
gdk/gdkdisplaymanager.c
INSTALL.in | 14 +-
NEWS | 32 +
README.in | 19 +
build/win32/vs9/gdk-win32.vcproj | 2 +-
build/win32/vs9/gtk+.vsprops | 1 -
configure.ac | 259 ++--
demos/Makefile.am | 6 +-
demos/gtk-demo/Makefile.am | 6 +-
docs/reference/gdk/Makefile.am | 5 +-
docs/reference/gdk/gdk-docs.sgml | 17 +-
docs/reference/gdk/multihead.sgml | 128 --
docs/reference/gtk/Makefile.am | 2 +-
docs/reference/gtk/building.sgml | 21 +-
docs/reference/gtk/compiling.sgml | 2 +-
docs/reference/gtk/gtk-docs.sgml | 8 +-
docs/reference/gtk/gtk-query-immodules-3.0.xml | 15 +-
docs/reference/gtk/gtk-update-icon-cache.xml | 32 +-
docs/reference/gtk/gtk3-sections.txt | 5 +
docs/reference/gtk/migrating-2to3.xml | 8 +-
docs/reference/gtk/question_index.sgml | 10 +-
docs/reference/gtk/running.sgml | 50 +-
docs/tools/Makefile.am | 10 +-
examples/Makefile.am | 4 +-
gail-3.0-uninstalled.pc.in | 2 +-
gail-3.0.pc.in | 2 +-
gdk-3.0.pc.in | 2 +-
gdk/Makefile.am | 36 +-
gdk/abicheck.sh | 2 +-
gdk/gdk.c | 26 +-
gdk/gdkcairo.c | 226 ++--
gdk/gdkcairo.h | 46 +-
gdk/gdkcolor.c | 100 +-
gdk/gdkcolor.h | 32 +-
gdk/gdkconfig.h.win32 | 33 +-
gdk/gdkdevice.c | 4 +-
gdk/gdkdevice.h | 2 +-
gdk/gdkdisplay.c | 36 +-
gdk/gdkdisplaymanager.c | 53 +-
gdk/gdkpixbuf-drawable.c | 94 +-
gdk/gdkpixbuf.h | 23 +-
gdk/gdkrgba.c | 89 +-
gdk/gdkrgba.h | 17 +-
gdk/gdkscreen.c | 17 +-
gdk/gdkwindow.c | 14 +-
gdk/tests/Makefile.am | 2 +-
gdk/win32/gdkdevice-win32.c | 6 +-
gdk/win32/gdkdisplay-win32.c | 3 -
gdk/win32/gdkdnd-win32.c | 33 +-
gdk/win32/gdkevents-win32.c | 79 +-
gdk/win32/gdkprivate-win32.h | 18 +-
gdk/win32/gdkscreen-win32.c | 1 -
gdk/win32/gdkselection-win32.c | 10 +-
gdk/win32/gdkwin32.h | 6 +-
gdk/win32/gdkwin32id.c | 2 +-
gdk/win32/gdkwindow-win32.c | 14 +-
gdk/x11/Makefile.am | 30 +-
gdk/x11/gdkdevice-xi.c | 25 +-
gdk/x11/gdkdevice-xi2.c | 24 +-
gdk/x11/gdkdevicemanager-xi.c | 34 +-
gdk/x11/gdkdevicemanager-xi2.c | 43 +-
gdk/x11/gdkprivate-x11.h | 8 +
gdk/x11/gdktestutils-x11.c | 9 +-
gtk+-3.0-uninstalled.pc.in | 2 +-
gtk+-3.0.pc.in | 2 +-
gtk-config-2.0.in | 4 -
gtk/Makefile.am | 37 +-
gtk/abicheck.sh | 2 +-
gtk/gtk.symbols | 12 +-
gtk/gtkaccellabel.c | 44 +-
gtk/gtkappchooserbutton.c | 7 +-
gtk/gtkappchooserbutton.h | 3 +
gtk/gtkappchooserdialog.h | 4 +
gtk/gtkappchooserwidget.h | 4 +
gtk/gtkassistant.c | 2 +
gtk/gtkborder.h | 12 +-
gtk/gtkbutton.c | 2 +
gtk/gtkcellarea.c | 8 +-
gtk/gtkcellareabox.c | 4 +-
gtk/gtkcellareabox.h | 6 +-
gtk/gtkcellareaboxcontext.c | 62 +-
gtk/gtkcellareaboxcontextprivate.h | 4 +-
gtk/gtkcellrenderer.c | 23 +-
gtk/gtkcolorsel.c | 2 -
gtk/gtkcombobox.c | 12 +-
gtk/gtkcomboboxtext.c | 9 +-
gtk/gtkcontainer.c | 5 +-
gtk/gtkcssprovider.c | 1 +
gtk/gtkdialog.c | 2 +
gtk/gtkdnd-quartz.c | 2 +-
gtk/gtkdnd.c | 63 +-
gtk/gtkentry.c | 21 +-
gtk/gtkfontsel.c | 2 +
gtk/gtkhandlebox.c | 2 +
gtk/gtkicontheme.c | 34 +-
gtk/gtkicontheme.h | 8 +-
gtk/gtkiconview.c | 2 +
gtk/gtkimage.c | 8 +-
gtk/gtkimage.h | 43 -
gtk/gtkimageprivate.h | 82 +
gtk/gtkinfobar.c | 2 +
gtk/gtklabel.c | 2 +
gtk/gtklinkbutton.c | 4 +-
gtk/gtkliststore.c | 4 +-
gtk/gtkmain.c | 29 +-
gtk/gtkmainprivate.h | 2 +
gtk/gtkmenu.c | 15 +-
gtk/gtkmenuitem.c | 33 +-
gtk/gtkmenuitem.h | 6 +-
gtk/gtkmessagedialog.c | 2 +-
gtk/gtkmodifierstyle.c | 42 +-
gtk/gtkmodifierstyle.h | 36 +-
gtk/gtkmodules.c | 27 +-
gtk/gtkprintbackend.c | 2 +-
gtk/gtkprintjob.c | 5 +-
gtk/gtksizegroup.c | 113 +-
gtk/gtkspinbutton.c | 20 +-
gtk/gtkstyle.c | 11 +
gtk/gtkstylecontext.c | 36 +-
gtk/gtkstylecontext.h | 3 +-
gtk/gtkstyleproperties.c | 5 +-
gtk/gtktextlayout.h | 4 +-
gtk/gtktextview.c | 2 +
gtk/gtkthemingengine.c | 146 ++-
gtk/gtktoolbar.c | 4 +-
gtk/gtktoolbutton.c | 2 +
gtk/gtktreestore.c | 4 +-
gtk/gtktreeview.c | 2 +
gtk/gtkviewport.c | 4 +-
gtk/gtkwidget.c | 168 ++-
gtk/gtkwidgetprivate.h | 12 +
gtk/gtkwindow.c | 2 +
gtk/makefile.msc.in | 23 +-
gtk/tests/Makefile.am | 6 +-
gtk/tests/testing.c | 41 +
modules/engines/ms-windows/Makefile.am | 4 +-
modules/engines/pixbuf/Makefile.am | 6 +-
modules/input/Makefile.am | 4 +-
modules/other/gail/Makefile.am | 4 +-
modules/other/gail/libgail-util/Makefile.am | 18 +-
modules/other/gail/libgail-util/gailmisc.c | 48 +-
modules/other/gail/tests/Makefile.am | 70 +-
modules/printbackends/cups/Makefile.am | 2 +-
modules/printbackends/file/Makefile.am | 2 +-
modules/printbackends/lpr/Makefile.am | 2 +-
modules/printbackends/papi/Makefile.am | 2 +-
modules/printbackends/test/Makefile.am | 2 +-
perf/Makefile.am | 6 +-
po-properties/gl.po | 1435 ++++++++--------
po/es.po | 757 +++++----
po/gl.po | 745 +++++----
po/he.po | 767 +++++----
po/ko.po | 312 +++-
po/nb.po | 757 +++++----
po/pl.po | 265 +++-
po/ug.po | 1015 +++++++-----
po/vi.po | 2153 ++++++++++++++----------
tests/Makefile.am | 14 +-
tests/makefile.msc | 3 +-
tests/simple.c | 33 +-
tests/testcombo.c | 2 -
tests/testexpand.c | 10 -
tests/testfilechooser.c | 3 +-
tests/testgtk.c | 17 +-
tests/testnouiprint.c | 12 +-
tests/testrecentchooser.c | 3 +-
tests/testsensitive.c | 111 ++
tests/teststatusicon.c | 4 +-
167 files changed, 6743 insertions(+), 5065 deletions(-)
---
diff --cc configure.ac
index 1b13ba3,4215ccc..a37651a
--- a/configure.ac
+++ b/configure.ac
@@@ -287,13 -294,9 +294,13 @@@ AC_ARG_ENABLE(win32-backend
[enable the Win32 gdk backend])],
[backend_set=yes])
AC_ARG_ENABLE(quartz-backend,
- [AC_HELP_STRING([--enable-quartz-backend],
+ [AS_HELP_STRING([--enable-quartz-backend],
[enable the quartz gdk backend])],
[backend_set=yes])
+AC_ARG_ENABLE(wayland-backend,
+ [AC_HELP_STRING([--enable-wayland-backend],
+ [enable the wayland gdk backend])],
+ [backend_set=yes])
if test -z "$backend_set"; then
if test "$platform_win32" = yes; then
diff --cc gdk/Makefile.am
index 91fcbb0,1e51edd..cfacc2a
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@@ -170,16 -170,12 +170,16 @@@ libgdk_3_la_LIBADD += quartz/libgdk-qua
endif # USE_QUARTZ
if USE_WIN32
- libgdk_3_0_la_SOURCES += gdkkeynames.c
- libgdk_3_0_la_LIBADD += win32/libgdk-win32.la
- libgdk_3_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
- libgdk_3_0_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
+ libgdk_3_la_SOURCES += gdkkeynames.c
+ libgdk_3_la_LIBADD += win32/libgdk-win32.la
+ libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
+ libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def
endif # USE_WIN32
+if USE_WAYLAND
- libgdk_3_0_la_LIBADD += wayland/libgdk-wayland.la
++libgdk_3_la_LIBADD += wayland/libgdk-wayland.la
+endif
+
if HAVE_INTROSPECTION
introspection_files = \
diff --cc gdk/gdkdisplaymanager.c
index f5bbc95,1c44204..6a2d071
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@@ -207,11 -235,11 +239,16 @@@ gdk_display_manager_get (void
manager = g_object_new (gdk_win32_display_manager_get_type (), NULL);
else
#endif
+#ifdef GDK_WINDOWING_WAYLAND
+ if (backend == NULL || strcmp (backend, "wayland") == 0)
+ manager = g_object_new (gdk_wayland_display_manager_get_type (), NULL);
+ else
+#endif
+ #ifdef GDK_WINDOWING_X11
+ if (backend == NULL || strcmp (backend, "x11") == 0)
+ manager = g_object_new (gdk_x11_display_manager_get_type (), NULL);
+ else
+ #endif
if (backend != NULL)
g_error ("Unsupported GDK backend: %s", backend);
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
