[gtk+/broadway: 386/388] Merge branch 'master' into broadway
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/broadway: 386/388] Merge branch 'master' into broadway
- Date: Fri, 11 Feb 2011 14:00:05 +0000 (UTC)
commit d4add8cefa6fa5c29bdb50f18e31cbfbfb38cc2b
Merge: a3b227f d847f48
Author: Alexander Larsson <alexl redhat com>
Date: Fri Feb 11 15:27:54 2011 +0100
Merge branch 'master' into broadway
HACKING | 16 +-
INSTALL.in | 14 +-
NEWS | 172 +-
README.in | 436 +-
build/win32/vs9/README.txt | 11 +-
build/win32/vs9/gdk-win32.vcproj | 2 +-
build/win32/vs9/gdk.vcprojin | 2 +-
build/win32/vs9/gtk+.vsprops | 4 +-
configure.ac | 168 +-
demos/Makefile.am | 6 +-
demos/gtk-demo/Makefile.am | 6 +-
demos/gtk-demo/images.c | 2 +-
docs/reference/gdk/Makefile.am | 5 +-
docs/reference/gdk/gdk-docs.sgml | 19 +-
docs/reference/gdk/gdk3-sections.txt | 14 +-
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/getting_started.xml | 62 +-
docs/reference/gtk/gtk-docs.sgml | 12 +-
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 | 14 +-
docs/reference/gtk/gtk3.types | 2 +-
docs/reference/gtk/migrating-2to3.xml | 140 +-
docs/reference/gtk/migrating-GtkApplication.xml | 16 +-
docs/reference/gtk/migrating-GtkStyleContext.xml | 19 +-
docs/reference/gtk/objects_grouped.sgml | 1 -
docs/reference/gtk/question_index.sgml | 10 +-
docs/reference/gtk/running.sgml | 39 +-
docs/reference/gtk/tmpl/.gitignore | 2 +
docs/reference/gtk/tmpl/gtkbindings.sgml | 296 -
docs/reference/gtk/tmpl/gtkclist.sgml | 1312 ---
docs/reference/gtk/tmpl/gtkpreview.sgml | 265 -
docs/reference/gtk/tmpl/gtkprintoperation.sgml | 701 --
docs/reference/gtk/tmpl/gtkprogress.sgml | 215 -
docs/reference/gtk/tmpl/gtkrc.sgml | 6 +-
docs/reference/gtk/tmpl/gtkrecentfilter.sgml | 207 -
docs/reference/gtk/tmpl/gtkruler.sgml | 134 -
docs/reference/gtk/tmpl/gtkthemes.sgml | 19 -
docs/reference/gtk/tmpl/gtktipsquery.sgml | 163 -
docs/reference/gtk/x11.sgml | 7 +
docs/tools/Makefile.am | 10 +-
examples/Makefile.am | 9 +-
examples/builder.c | 40 +
examples/builder.ui | 45 +
examples/menu/Makefile | 9 +-
examples/menu/itemfactory.c | 176 -
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 | 40 +-
gdk/gdk.symbols | 8 +-
gdk/gdkcairo.c | 226 +-
gdk/gdkcairo.h | 46 +-
gdk/gdkcolor.c | 100 +-
gdk/gdkcolor.h | 32 +-
gdk/gdkconfig.h.win32 | 33 +-
gdk/gdkcursor.c | 2 +-
gdk/gdkdevice.c | 63 +-
gdk/gdkdevice.h | 2 +-
gdk/gdkdisplay.c | 186 +-
gdk/gdkdisplay.h | 5 -
gdk/gdkdisplaymanager.c | 47 +-
gdk/gdkdisplayprivate.h | 13 +-
gdk/gdkdnd.c | 4 +-
gdk/gdkdnd.h | 8 +-
gdk/gdkevents.c | 106 +-
gdk/gdkevents.h | 86 +-
gdk/gdkinternals.h | 23 +-
gdk/gdkkeys.c | 15 +-
gdk/gdkoffscreenwindow.c | 64 +-
gdk/gdkpango.c | 8 +-
gdk/gdkpixbuf-drawable.c | 94 +-
gdk/gdkpixbuf.h | 23 +-
gdk/gdkrectangle.c | 2 +-
gdk/gdkrgba.c | 89 +-
gdk/gdkrgba.h | 17 +-
gdk/gdkscreen.c | 45 +-
gdk/gdkscreen.h | 3 -
gdk/gdkselection.c | 15 +-
gdk/gdkselection.h | 6 +-
gdk/gdktypes.h | 18 -
gdk/gdkvisual.c | 8 +-
gdk/gdkwindow.c | 156 +-
gdk/gdkwindow.h | 4 +
gdk/gdkwindowimpl.h | 2 +
gdk/keyname-table.h | 39 +
gdk/quartz/gdkdevice-core-quartz.c | 3 +-
gdk/quartz/gdkdisplay-quartz.c | 4 -
gdk/quartz/gdkdnd-quartz.c | 10 -
gdk/quartz/gdkevents-quartz.c | 19 -
gdk/quartz/gdkprivate-quartz.h | 20 -
gdk/quartz/gdkselection-quartz.c | 11 -
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 | 20 +-
gdk/win32/gdkscreen-win32.c | 1 -
gdk/win32/gdkselection-win32.c | 10 +-
gdk/win32/gdkvisual-win32.c | 4 -
gdk/win32/gdkwin32.h | 6 +-
gdk/win32/gdkwin32id.c | 2 +-
gdk/win32/gdkwindow-win32.c | 14 +-
gdk/x11/checksettings.c | 3 -
gdk/x11/gdkasync.c | 6 +-
gdk/x11/gdkcursor-x11.c | 26 +-
gdk/x11/gdkdevice-xi.c | 4 -
gdk/x11/gdkdevice-xi2.c | 36 +-
gdk/x11/gdkdevicemanager-core-x11.c | 130 +-
gdk/x11/gdkdevicemanager-xi2.c | 223 +-
gdk/x11/gdkdisplay-x11.c | 151 +-
gdk/x11/gdkdisplay-x11.h | 7 +-
gdk/x11/gdkdnd-x11.c | 107 +-
gdk/x11/gdkeventsource.c | 8 +-
gdk/x11/gdkgeometry-x11.c | 2 -
gdk/x11/gdkmain-x11.c | 11 +-
gdk/x11/gdkprivate-x11.h | 18 +-
gdk/x11/gdkproperty-x11.c | 12 +-
gdk/x11/gdkscreen-x11.c | 93 +-
gdk/x11/gdkselection-x11.c | 21 +-
gdk/x11/gdksettings.c | 9 +-
gdk/x11/gdkvisual-x11.c | 6 +-
gdk/x11/gdkwindow-x11.c | 33 +-
gdk/x11/gdkx11utils.h | 17 +
gtk+-3.0-uninstalled.pc.in | 2 +-
gtk+-3.0.pc.in | 2 +-
gtk-config-2.0.in | 4 -
gtk/Makefile.am | 102 +-
gtk/abicheck.sh | 2 +-
gtk/circles.xbm | 46 -
gtk/gtk-keys.css.default | 3 +
gtk/gtk-keys.css.emacs | 123 +
gtk/gtk-keys.css.mac | 205 +
gtk/gtk.css.raleigh | 3 +
gtk/gtk.h | 2 -
gtk/gtk.symbols | 24 +-
gtk/gtkaboutdialog.c | 24 +-
gtk/gtkaccelgroup.c | 17 +-
gtk/gtkaccellabel.c | 37 +-
gtk/gtkaccelmap.c | 7 +-
gtk/gtkaction.c | 14 +-
gtk/gtkactiongroup.c | 24 +-
gtk/gtkalignment.c | 12 +-
gtk/gtkalignment.h | 6 +
gtk/gtkappchooserbutton.c | 104 +-
gtk/gtkappchooserbutton.h | 8 +
gtk/gtkappchooserdialog.c | 76 +-
gtk/gtkappchooserdialog.h | 23 +-
gtk/gtkappchooserwidget.c | 22 +-
gtk/gtkappchooserwidget.h | 4 +
gtk/gtkapplication.c | 9 +-
gtk/gtkapplication.h | 2 +-
gtk/gtkarrow.h | 6 +
gtk/gtkaspectframe.h | 6 +
gtk/gtkassistant.c | 730 +-
gtk/gtkbbox.c | 2 -
gtk/gtkbbox.h | 6 +
gtk/gtkbin.h | 6 +
gtk/gtkbindings.c | 798 +-
gtk/gtkbindings.h | 213 +-
gtk/gtkbindingsprivate.h | 37 +
gtk/gtkborder.h | 12 +-
gtk/gtkbox.c | 20 +-
gtk/gtkbuildable.c | 6 +-
gtk/gtkbuilder.c | 11 +-
gtk/gtkbutton.c | 37 +-
gtk/gtkcalendar.c | 1340 ++--
gtk/gtkcellarea.c | 372 +-
gtk/gtkcellarea.h | 4 -
gtk/gtkcellareabox.c | 4 +-
gtk/gtkcellareabox.h | 6 +-
gtk/gtkcellareaboxcontext.c | 64 +-
gtk/gtkcellareaboxcontextprivate.h | 4 +-
gtk/gtkcellareacontext.c | 2 +-
gtk/gtkcelllayout.c | 124 +-
gtk/gtkcellrenderer.c | 126 +-
gtk/gtkcellrenderer.h | 4 +
gtk/gtkcellrendereraccel.c | 15 +-
gtk/gtkcellrendererpixbuf.c | 74 +-
gtk/gtkcellrendererprogress.c | 88 +-
gtk/gtkcellrendererspinner.c | 4 +-
gtk/gtkcellrenderertext.c | 104 +-
gtk/gtkcellrenderertoggle.c | 62 +-
gtk/gtkcellview.c | 61 +-
gtk/gtkcellview.h | 6 +-
gtk/gtkcheckmenuitem.c | 3 -
gtk/gtkclipboard.c | 38 +-
gtk/gtkcolorbutton.c | 2 +
gtk/gtkcolorsel.c | 1448 ++--
gtk/gtkcombobox.c | 113 +-
gtk/gtkcomboboxtext.c | 62 +-
gtk/gtkcontainer.c | 1091 +-
gtk/gtkcssprovider.c | 277 +-
gtk/gtkcssprovider.h | 6 +
gtk/gtkcssproviderprivate.h | 31 +
gtk/gtkcustompaperunixdialog.c | 2 -
gtk/gtkdialog.c | 7 +-
gtk/gtkdnd-quartz.c | 2 +-
gtk/gtkdnd.c | 207 +-
gtk/gtkdrawingarea.c | 6 +-
gtk/gtkeditable.c | 8 +-
gtk/gtkentry.c | 68 +-
gtk/gtkentrycompletion.c | 43 +-
gtk/gtkfilechooser.c | 32 +-
gtk/gtkfilechooserbutton.c | 130 +-
gtk/gtkfilechooserdefault.c | 350 +-
gtk/gtkfilechooserdialog.c | 23 -
gtk/gtkfilechooserentry.c | 113 +-
gtk/gtkfilefilter.c | 196 +-
gtk/gtkfixed.c | 6 +-
gtk/gtkfixed.h | 6 +
gtk/gtkfontsel.c | 22 +-
gtk/gtkframe.c | 6 +-
gtk/gtkgrid.c | 2 +-
gtk/gtkhandlebox.c | 54 +-
gtk/gtkhsv.c | 26 +-
gtk/gtkiconfactory.c | 87 +-
gtk/gtkicontheme.c | 82 +-
gtk/gtkicontheme.h | 6 +
gtk/gtkiconview.c | 442 +-
gtk/gtkimage.c | 8 +-
gtk/gtkimage.h | 43 -
gtk/gtkimageprivate.h | 82 +
gtk/gtkimcontext.c | 24 +-
gtk/gtkimcontextsimple.c | 2 +-
gtk/gtkinfobar.c | 16 +-
gtk/gtklabel.c | 77 +-
gtk/gtklayout.c | 6 +-
gtk/gtklinkbutton.c | 4 +-
gtk/gtkliststore.c | 14 +-
gtk/gtkmain.c | 55 +-
gtk/gtkmainprivate.h | 2 +
gtk/gtkmenu.c | 52 +-
gtk/gtkmenuitem.c | 35 +-
gtk/gtkmenuitem.h | 6 +-
gtk/gtkmenushell.c | 4 +-
gtk/gtkmessagedialog.c | 2 +-
gtk/gtkmisc.c | 10 +-
gtk/gtkmisc.h | 6 +
gtk/gtkmodifierstyle.c | 42 +-
gtk/gtkmodifierstyle.h | 42 +-
gtk/gtkmodules.c | 27 +-
gtk/gtkmountoperation-x11.c | 3 -
gtk/gtkmountoperation.c | 14 +-
gtk/gtknotebook.c | 67 +-
gtk/gtknumerableicon.c | 4 +-
gtk/gtknumerableicon.h | 2 +-
gtk/gtkoffscreenwindow.c | 3 -
gtk/gtkorientable.c | 2 +-
gtk/gtkorientable.h | 3 -
gtk/gtkorientableprivate.h | 31 +
gtk/gtkpagesetupunixdialog.c | 6 +-
gtk/gtkpapersize.c | 18 +-
gtk/gtkpathbar.c | 34 +-
gtk/gtkplug-stub.c | 83 -
gtk/gtkplug-win32.c | 322 -
gtk/gtkplug-x11.c | 390 -
gtk/gtkplug.c | 614 +-
gtk/gtkplug.h | 51 +-
gtk/gtkplugprivate.h | 153 -
gtk/gtkprintbackend.c | 2 +-
gtk/gtkprintcontext.c | 18 +-
gtk/gtkprinter.c | 10 +-
gtk/gtkprintjob.c | 14 +-
gtk/gtkprintoperation-unix.c | 5 +-
gtk/gtkprintoperation-win32.c | 2 +-
gtk/gtkprintoperation.c | 76 +-
gtk/gtkprintoperation.h | 155 +-
gtk/gtkprintsettings.c | 9 +-
gtk/gtkprintunixdialog.c | 4 +-
gtk/gtkprogressbar.c | 2 +-
gtk/gtkradiobutton.c | 31 +-
gtk/gtkradiomenuitem.c | 9 +-
gtk/gtkradiotoolbutton.c | 4 +-
gtk/gtkrange.c | 90 +-
gtk/gtkrbtree.h | 4 -
gtk/gtkrc.c | 25 +-
gtk/gtkrecentchooser.c | 5 +-
gtk/gtkrecentchoosermenu.c | 9 +-
gtk/gtkrecentfilter.c | 248 +-
gtk/gtkrecentfilter.h | 33 +
gtk/gtkrecentmanager.c | 47 +-
gtk/gtkscale.c | 17 +-
gtk/gtkscale.h | 7 -
gtk/gtkscalebutton.c | 46 +-
gtk/gtkscaleprivate.h | 38 +
gtk/gtkscrolledwindow.c | 14 +-
gtk/gtkselection.c | 60 +-
gtk/gtkseparator.c | 10 +-
gtk/gtksettings.c | 300 +-
gtk/gtksizegroup.c | 113 +-
gtk/gtksizerequest.c | 9 +-
gtk/gtksocket-stub.c | 120 -
gtk/gtksocket-win32.c | 322 -
gtk/gtksocket-x11.c | 669 --
gtk/gtksocket.c | 748 ++-
gtk/gtksocket.h | 26 +-
gtk/gtksocketprivate.h | 138 +-
gtk/gtkspinbutton.c | 40 +-
gtk/gtkspinner.c | 2 -
gtk/gtkspinner.h | 2 +-
gtk/gtkstatusbar.c | 23 +-
gtk/gtkstatusicon.c | 35 +-
gtk/gtkstatusicon.h | 2 +
gtk/gtkstock.c | 8 +-
gtk/gtkstyle.c | 169 +-
gtk/gtkstyle.h | 3 -
gtk/gtkstylecontext.c | 97 +-
gtk/gtkstylecontext.h | 213 +-
gtk/gtkstylecontextprivate.h | 43 +
gtk/gtkstyleproperties.c | 39 +-
gtk/gtkstyleproperties.h | 6 +
gtk/gtkstyleprovider.c | 5 +-
gtk/gtktearoffmenuitem.c | 84 +-
gtk/gtktestutils.c | 50 +-
gtk/gtktextbuffer.c | 20 +-
gtk/gtktextbufferrichtext.c | 29 +-
gtk/gtktextdisplay.c | 16 +-
gtk/gtktextiter.c | 2 +-
gtk/gtktextlayout.h | 4 +-
gtk/gtktextview.c | 82 +-
gtk/gtktextview.h | 4 +
gtk/gtkthemingengine.c | 210 +-
gtk/gtkthemingengine.h | 4 +-
gtk/gtktimeline.c | 2 -
gtk/gtktogglebutton.c | 5 +
gtk/gtktoolbar.c | 363 +-
gtk/gtktoolbutton.c | 2 +
gtk/gtktoolitemgroup.c | 23 +-
gtk/gtktoolpalette.c | 11 +-
gtk/gtktooltip.c | 21 +-
gtk/gtktrayicon-x11.c | 4 -
gtk/gtktreednd.c | 7 +-
gtk/gtktreemodel.c | 10 +-
gtk/gtktreemodelfilter.c | 10 +-
gtk/gtktreeprivate.h | 2 +
gtk/gtktreestore.c | 9 +-
gtk/gtktreeview.c | 768 +-
gtk/gtktreeviewcolumn.c | 110 +-
gtk/gtkviewport.c | 4 +-
gtk/gtkwidget.c | 722 +-
gtk/gtkwidget.h | 5 +-
gtk/gtkwidgetpath.c | 13 +-
gtk/gtkwidgetprivate.h | 32 +-
gtk/gtkwin32embedwidget.c | 9 +-
gtk/gtkwin32embedwidget.h | 2 +-
gtk/gtkwindow.c | 213 +-
gtk/gtkwindowprivate.h | 6 +-
gtk/gtkx.h | 29 +
gtk/line-arrow.xbm | 4 -
gtk/line-wrap.xbm | 4 -
gtk/makefile.msc.in | 27 +-
gtk/queryimmodules.c | 6 -
gtk/tests/Makefile.am | 10 +-
gtk/tests/builder.c | 4 +-
gtk/tests/cellarea.c | 855 ++
gtk/tests/filtermodel.c | 14 +-
gtk/tests/stylecontext.c | 19 +
gtk/tests/testing.c | 21 +
gtk/tests/treeview-scrolling.c | 3 -
gtk/theme-bits/Makefile.am | 15 -
gtk/theme-bits/README | 29 -
gtk/theme-bits/check-13-inconsistent.png | Bin 197 -> 0 bytes
gtk/theme-bits/check-13.png | Bin 267 -> 0 bytes
gtk/theme-bits/decompose-bits.c | 177 -
gtk/theme-bits/radio-13-inconsistent.png | Bin 335 -> 0 bytes
gtk/theme-bits/radio-13.png | Bin 317 -> 0 bytes
gtk/tree_minus.xbm | 5 -
gtk/tree_minus.xpm | 18 -
gtk/tree_plus.xbm | 5 -
gtk/tree_plus.xpm | 18 -
gtk/updateiconcache.c | 166 +-
modules/engines/Makefile.am | 4 +-
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/gail.c | 2 +-
modules/other/gail/gailentry.c | 9 +-
modules/other/gail/gailexpander.c | 2 -
modules/other/gail/gailrenderercell.c | 3 -
modules/other/gail/gailtextview.c | 2 -
modules/other/gail/gailtoplevel.c | 4 +-
modules/other/gail/gailtreeview.c | 19 +-
modules/other/gail/gailwidget.c | 8 +-
modules/other/gail/gailwindow.c | 2 +-
modules/other/gail/libgail-util/Makefile.am | 18 +-
modules/other/gail/tests/Makefile.am | 70 +-
modules/other/gail/tests/ferret.c | 6 +-
modules/other/gail/tests/testcombo.c | 3 -
modules/other/gail/tests/testlib.c | 3 -
modules/other/gail/tests/testpaned.c | 3 -
modules/printbackends/cups/Makefile.am | 2 +-
modules/printbackends/cups/gtkprintbackendcups.c | 3 -
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/el.po | 5811 ++++++-----
po-properties/en.po | 7393 +++++++++++++
po-properties/es.po | 1882 ++--
po-properties/gl.po | 1829 ++--
po-properties/he.po | 1492 ++--
po-properties/ko.po | 4965 +++++-----
po-properties/nb.po | 3858 ++++----
po-properties/pa.po | 2319 +++--
po-properties/pl.po | 5518 +++++-----
po-properties/zh_HK.po | 3552 ++++---
po-properties/zh_TW.po | 3555 ++++---
po/LINGUAS | 1 +
po/ar.po | 2387 +----
po/ca.po | 1934 ++--
po/de.po | 1773 ++--
po/el.po | 2298 +++--
po/en.po | 4405 ++++++++
po/eo.po | 1999 ++--
po/es.po | 806 +-
po/et.po | 20 +-
po/gl.po | 865 +-
po/he.po | 217 +-
po/it.po | 2828 ++----
po/kk.po | 1161 ++-
po/ko.po | 2760 ++---
po/nb.po | 778 +-
po/pa.po |12408 +++++++++-------------
po/pl.po | 2938 ++---
po/zh_CN.po | 1990 ++--
po/zh_HK.po | 1107 ++-
po/zh_TW.po | 1109 ++-
tests/Makefile.am | 23 +-
tests/makefile.msc | 3 +-
tests/simple.c | 1 -
tests/testappchooser.c | 2 +
tests/testappchooserbutton.c | 1 +
tests/testclientmessage.c | 122 -
tests/testgtk.c | 26 -
tests/testgtk.css | 9 +
tests/testnoscreen.c | 47 +
tests/testsensitive.c | 111 +
tests/testsocket.c | 3 +-
tests/testsocket_common.c | 2 +-
tests/testtoolbar.c | 23 -
tests/testtreepos.c | 140 +
450 files changed, 60696 insertions(+), 54860 deletions(-)
---
diff --cc configure.ac
index bac94f5,d9fb277..417c3f2
--- 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(broadway-backend,
+ [AC_HELP_STRING([--enable-broadway-backend],
+ [enable the broadway (HTML5) gdk backend])],
+ [backend_set=yes])
if test -z "$backend_set"; then
if test "$platform_win32" = yes; then
diff --cc gdk/Makefile.am
index 90b4520,1e51edd..01d3232
--- 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_BROADWAY
+libgdk_3_0_la_LIBADD += broadway/libgdk-broadway.la
+endif # USE_BROADWAY
+
if HAVE_INTROSPECTION
introspection_files = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
