GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
endif
-SUBDIRS = . tests
+SUBDIRS = . a11y tests
if HAVE_PAPI_CUPS
GTK_PRINT_BACKENDS=file,papi,cups
libgtkincludedir = $(includedir)/gtk-3.0/gtk
libadd = \
- $(top_builddir)/gdk/libgdk-3.0.la \
+ $(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS)
deps =
gtklayout.h \
gtklinkbutton.h \
gtkliststore.h \
+ gtklockbutton.h \
gtkmain.h \
gtkmenu.h \
gtkmenubar.h \
gtknumerableicon.h \
gtkoffscreenwindow.h \
gtkorientable.h \
+ gtkoverlay.h \
gtkpagesetup.h \
gtkpaned.h \
gtkpapersize.h \
# GTK+ header files that don't get installed
gtk_private_h_sources = \
- gtk9slice.h \
gtkaccelgroupprivate.h \
+ gtkaccessibleprivate.h \
gtkanimationdescription.h \
gtkappchooserprivate.h \
gtkappchoosermodule.h \
gtkappchooseronline.h \
+ gtkbindingsprivate.h \
+ gtkborderimageprivate.h \
gtkbuilderprivate.h \
gtkbuttonprivate.h \
gtkcellareaboxcontextprivate.h \
+ gtkcontainerprivate.h \
+ gtkcssparserprivate.h \
gtkcssproviderprivate.h \
+ gtkcssselectorprivate.h \
+ gtkcsstypesprivate.h \
gtkcustompaperunixdialog.h \
gtkdndcursors.h \
gtkentryprivate.h \
gtkfilesystem.h \
gtkfilesystemmodel.h \
gtkiconcache.h \
+ gtkimageprivate.h \
gtkimcontextsimpleseqs.h \
gtkintl.h \
gtkkeyhash.h \
gtkrecentchooserdefault.h \
gtkrecentchooserprivate.h \
gtkrecentchooserutils.h \
+ gtkroundedboxprivate.h \
+ gtkscaleprivate.h \
gtksearchengine.h \
gtksearchenginesimple.h \
gtkselectionprivate.h \
gtksettingsprivate.h \
+ gtkshadowprivate.h \
gtksizegroup-private.h \
gtksocketprivate.h \
gtkstylecontextprivate.h \
+ gtkstylepropertiesprivate.h \
+ gtkstylepropertyprivate.h \
gtktextbtree.h \
gtktextbufferserialize.h \
gtktextchildprivate.h \
gtktexttagprivate.h \
gtktexttypes.h \
gtktextutil.h \
+ gtkthemingengineprivate.h \
gtktimeline.h \
gtktoolpaletteprivate.h \
gtktreedatalist.h \
# GTK+ C sources to build the library from
gtk_base_c_sources = \
- gtk9slice.c \
gtkquery.c \
gtksearchengine.c \
gtksearchenginesimple.c \
gtkbin.c \
gtkbindings.c \
gtkborder.c \
+ gtkborderimage.c \
gtkbox.c \
gtkbuildable.c \
gtkbuilder.c \
gtkcombobox.c \
gtkcomboboxtext.c \
gtkcontainer.c \
+ gtkcssparser.c \
gtkcssprovider.c \
+ gtkcssselector.c \
+ gtkcsstypes.c \
gtkdialog.c \
gtkdrawingarea.c \
gtkeditable.c \
gtklayout.c \
gtklinkbutton.c \
gtkliststore.c \
+ gtklockbutton.c \
gtkmain.c \
gtkmarshalers.c \
gtkmenu.c \
gtknumerableicon.c \
gtkoffscreenwindow.c \
gtkorientable.c \
+ gtkoverlay.c \
gtkpagesetup.c \
gtkpaned.c \
gtkpango.c \
gtkrecentchooser.c \
gtkrecentfilter.c \
gtkrecentmanager.c \
+ gtkroundedbox.c \
gtkscale.c \
gtkscalebutton.c \
gtkscrollable.c \
gtksettings.c \
gtksizegroup.c \
gtksizerequest.c \
+ gtkshadow.c \
gtkshow.c \
gtkspinbutton.c \
gtkspinner.c \
gtkstock.c \
gtkstylecontext.c \
gtkstyleproperties.c \
+ gtkstyleproperty.c \
gtkstyleprovider.c \
gtkstyle.c \
gtkswitch.c \
gtktypefuncs.c: @REBUILD@ stamp-gtktypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
$(AM_V_GEN) echo '#include <gtk/gtkx.h>' > xgen-gtfsrc.c && \
- ${CPP} $(DEFS) $(INCLUDES) -DGTK_ENABLE_BROKEN $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
+ ${CPP} $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
$(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
sort | uniq | \
- $(SED) '{ s/^/*tp++ = /; s/$$/();/; }' > xgen-gtf \
+ $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' > xgen-gtf \
&& cp xgen-gtf $@ && rm -f xgen-gtf
gtktestutils.c: gtktypefuncs.c
# target platform:
-lib_LTLIBRARIES = libgtk-3.0.la
+lib_LTLIBRARIES = libgtk-3.la
gtkincludedir = $(includedir)/gtk-3.0/gtk
gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
-libgtk_3_0_la_SOURCES = $(gtk_c_sources)
-libgtk_3_0_la_LDFLAGS = $(libtool_opts)
-libgtk_3_0_la_LIBADD = $(libadd)
-libgtk_3_0_la_DEPENDENCIES = $(deps)
-
-#libgtk_win32_3_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
+libgtk_3_la_SOURCES = $(gtk_c_sources)
+libgtk_3_la_LDFLAGS = $(libtool_opts)
+libgtk_3_la_LIBADD = $(libadd)
+libgtk_3_la_DEPENDENCIES = $(deps)
if USE_WIN32
-libgtk_3_0_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -luuid
-libgtk_3_0_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)
+libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
+libgtk_3_la_LDFLAGS += -Wl,-luuid
+libgtk_3_la_DEPENDENCIES += $(gtk_def) $(gtk_win32_res) $(deps)
libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
endif
install-exec-hook:
if DISABLE_EXPLICIT_DEPS
- $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.0.la
+ $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.la
endif
if USE_QUARTZ
install-mac-key-theme:
- $(mkdir_p) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key
- $(INSTALL_DATA) $(srcdir)/gtkrc.key.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key/gtkrc
+ $(mkdir_p) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0
+ $(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
uninstall-mac-key-theme:
- rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0-key/gtkrc
+ rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
else
install-mac-key-theme:
uninstall-mac-key-theme:
endif
-dist-hook: ../build/win32/vs9/gtk.vcproj
+dist-hook: ../build/win32/vs9/gtk.vcproj ../build/win32/vs10/gtk.vcxproj ../build/win32/vs10/gtk.vcxproj.filters
../build/win32/vs9/gtk.vcproj: ../build/win32/vs9/gtk.vcprojin
for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
done >libgtk.sourcefiles
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk.vcprojin >$@
rm libgtk.sourcefiles
+
+../build/win32/vs10/gtk.vcxproj: ../build/win32/vs10/gtk.vcxprojin
+ for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
+ case $$F in \
+ *.c) echo ' <ClCompile Include="..\..\..\gtk\'$$F'" />' \
+ ;; \
+ esac; \
+ done >libgtk.vs10.sourcefiles
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxprojin >$@
+ rm libgtk.vs10.sourcefiles
+
+../build/win32/vs10/gtk.vcxproj.filters: ../build/win32/vs10/gtk.vcxproj.filtersin
+ for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
+ case $$F in \
+ *.c) echo ' <ClCompile Include="..\..\..\gtk\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+ ;; \
+ esac; \
+ done >libgtk.vs10.sourcefiles.filters
+ $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk.vcxproj.filtersin >$@
+ rm libgtk.vs10.sourcefiles.filters
# Install a RC file for the default GTK+ theme, and key themes
install-data-local: install-ms-lib install-def-file install-mac-key-theme
$(mkdir_p) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0
- $(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtkrc
- $(mkdir_p) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key
- $(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key/gtkrc
- $(mkdir_p) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key
- $(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key/gtkrc
+ $(INSTALL_DATA) $(srcdir)/gtk.css.raleigh $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtk.css
+ $(mkdir_p) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0
+ $(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
+ $(mkdir_p) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0
+ $(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
- rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtkrc
- rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0-key/gtkrc
- rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0-key/gtkrc
+ rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtk.css
+ rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
+ rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
# if srcdir!=builddir, clean out maintainer-clean files from builddir
# this allows dist to pass.
rm -f $(MAINTAINERCLEANFILES); \
fi
-DEPS = libgtk-3.0.la $(top_builddir)/gdk/libgdk-3.0.la
+DEPS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
TEST_DEPS = $(DEPS) immodules.cache
LDADDS = \
- libgtk-3.0.la \
- $(top_builddir)/gdk/libgdk-3.0.la \
+ libgtk-3.la \
+ $(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS)
if HAVE_INTROSPECTION
gtktypebuiltins.h \
gtktypebuiltins.c
-Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.0.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
+Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
Gtk_3_0_gir_SCANNERFLAGS = \
--add-include-path=$(top_builddir)/gdk \
--include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
endif
Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
-Gtk_3_0_gir_INCLUDES = Atk-1.0 Gdk-3.0
+Gtk_3_0_gir_INCLUDES = Atk-1.0
Gtk_3_0_gir_CFLAGS = \
$(INCLUDES) \
-UGDK_DISABLE_DEPRECATED \
-UGTK_DISABLE_DEPRECATED \
-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-Gtk_3_0_gir_LIBS = libgtk-3.0.la
+Gtk_3_0_gir_LIBS = libgtk-3.la
Gtk_3_0_gir_FILES = $(introspection_files)
Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0
INTROSPECTION_GIRS += Gtk-3.0.gir
if BUILD_ICON_CACHE
bin_PROGRAMS += gtk-update-icon-cache
-endif
if OS_WIN32
echo '</assembly>' ) >$@
endif
+endif
gtk_query_immodules_3_0_DEPENDENCIES = $(DEPS)
gtk_query_immodules_3_0_LDADD = $(LDADDS)
stock-icons/16/window-close.png \
stock-icons/16/gtk-connect.png \
stock-icons/16/gtk-convert.png \
+ stock-icons/16/edit-clear.png \
stock-icons/16/edit-copy.png \
stock-icons/16/edit-cut.png \
stock-icons/16/edit-delete.png \
stock-icons/16/gtk-disconnect.png \
stock-icons/16/gtk-edit.png \
stock-icons/16/system-run.png \
- stock-icons/16/document-x-generic.png \
+ stock-icons/16/text-x-generic.png \
stock-icons/16/edit-find-replace.png \
stock-icons/16/edit-find.png \
stock-icons/16/media-floppy.png \
stock-icons/16/go-last-ltr.png \
stock-icons/16/go-top.png \
stock-icons/16/go-up.png \
+ stock-icons/16/gtk-caps-lock-warning.png \
+ stock-icons/16/gtk-color-picker.png \
stock-icons/16/drive-harddisk.png \
stock-icons/16/help-contents.png \
stock-icons/16/go-home.png \
stock-icons/16/network-idle.png \
stock-icons/16/document-new.png \
stock-icons/16/document-open.png \
+ stock-icons/16/gtk-orientation-landscape.png \
+ stock-icons/16/gtk-orientation-portrait.png \
+ stock-icons/16/gtk-orientation-reverse-landscape.png \
+ stock-icons/16/gtk-orientation-reverse-portrait.png \
stock-icons/16/gtk-page-setup.png \
stock-icons/16/edit-paste.png \
stock-icons/16/gtk-preferences.png \
stock-icons/24/media-optical.png \
stock-icons/24/edit-clear.png \
stock-icons/24/window-close.png \
+ stock-icons/24/gtk-caps-lock-warning.png \
stock-icons/24/gtk-color-picker.png \
stock-icons/24/gtk-connect.png \
stock-icons/24/gtk-convert.png \
stock-icons/24/gtk-disconnect.png \
stock-icons/24/gtk-edit.png \
stock-icons/24/system-run.png \
- stock-icons/24/document-x-generic.png \
+ stock-icons/24/text-x-generic.png \
stock-icons/24/edit-find-replace.png \
stock-icons/24/edit-find.png \
stock-icons/24/gtk-font.png \
&& $(LN_S) folder.png user-home.png \
&& $(RM) user-desktop.png \
&& $(LN_S) folder.png user-desktop.png \
- && $(RM) text-x-generic.png \
- && $(LN_S) document-x-generic.png text-x-generic.png \
) done \
&& touch stamp-icons
endif
gtkbuiltincache.h: @REBUILD@ stamp-icons
+if !USE_EXTERNAL_ICON_CACHE
$(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+endif
$(AM_V_GEN) $(gtk_update_icon_cache_program) --quiet --force --ignore-theme-index \
--source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
mv gtkbuiltincache.h.tmp gtkbuiltincache.h
gtkprint-win32.h \
gtkprint-win32.c \
gtksearchenginequartz.h \
- gtkrc.default \
- gtkrc.key.default \
- gtkrc.key.emacs \
- gtkrc.key.mac \
+ gtk.css.raleigh \
+ gtk-keys.css.default \
+ gtk-keys.css.emacs \
+ gtk-keys.css.mac \
makefile.msc \
makefile.msc.in \
abicheck.sh \
projects / ~andy / gtk / blobdiff