Use gdk_threads_add_timeout to popup the selection window

[~andy/gtk] / gtk / Makefile.am

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 9322eb3f52eb540c19e0a9a8b58077b3e7480a69..f9797c5d4f53ef9c4175c9d03a7ddf69f6ad830b 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -16,7 +16,7 @@ else
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
 
-SUBDIRS = a11y . tests
+SUBDIRS = a11y native . tests
 
 if HAVE_PAPI_CUPS
 GTK_PRINT_BACKENDS=file,papi,cups
@@ -202,6 +202,7 @@ gtk_public_h_sources =              \
        gtkbindings.h           \
        gtkborder.h             \
        gtkbox.h                \
+       gtkbubblewindow.h       \
        gtkbuilder.h            \
        gtkbuildable.h          \
        gtkbutton.h             \
@@ -319,6 +320,7 @@ gtk_public_h_sources =              \
        gtkscrolledwindow.h     \
        gtksearchentry.h        \
        gtkselection.h          \
+       gtkselectionwindow.h    \
        gtkseparator.h          \
        gtkseparatormenuitem.h  \
        gtkseparatortoolitem.h  \
@@ -447,6 +449,7 @@ gtk_private_h_sources =             \
        gtkcssimagegradientprivate.h    \
        gtkcssimagelinearprivate.h      \
        gtkcssimageprivate.h    \
+       gtkcssimagesurfaceprivate.h     \
        gtkcssimageurlprivate.h \
        gtkcssimagevalueprivate.h       \
        gtkcssimagewin32private.h       \
@@ -620,6 +623,7 @@ gtk_base_c_sources =                \
        gtkborder.c             \
        gtkborderimage.c        \
        gtkbox.c                \
+       gtkbubblewindow.c       \
        gtkbuildable.c          \
        gtkbuilder.c            \
        gtkbuilderparser.c      \
@@ -672,6 +676,7 @@ gtk_base_c_sources =                \
        gtkcssimagecrossfade.c  \
        gtkcssimagegradient.c   \
        gtkcssimagelinear.c     \
+       gtkcssimagesurface.c    \
        gtkcssimageurl.c        \
        gtkcssimagevalue.c      \
        gtkcssimagewin32.c      \
@@ -807,6 +812,7 @@ gtk_base_c_sources =                \
        gtkscrollbar.c          \
        gtkscrolledwindow.c     \
        gtkselection.c          \
+       gtkselectionwindow.c    \
        gtkseparator.c          \
        gtkseparatormenuitem.c  \
        gtkseparatortoolitem.c  \
@@ -1304,9 +1310,7 @@ endif
 #
 # Installed tools
 #
-bin_PROGRAMS = \
-       gtk-query-immodules-3.0 \
-       gtk-launch
+bin_PROGRAMS = gtk-query-immodules-3.0
 
 if BUILD_ICON_CACHE
 bin_PROGRAMS += gtk-update-icon-cache
@@ -1353,8 +1357,11 @@ gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
 gtk_update_icon_cache_SOURCES = updateiconcache.c
 endif
 
+if HAVE_GIO_UNIX
+bin_PROGRAMS += gtk-launch
 gtk_launch_LDADD = $(LDADDS)
 gtk_launch_SOURCES = gtk-launch.c
+endif
 
 .PHONY: files test test-debug
 
@@ -1654,12 +1661,20 @@ stamp-icons: $(STOCK_ICONS)
 if USE_EXTERNAL_ICON_CACHE
 gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
 else
-gtk_update_icon_cache_program = ./gtk-update-icon-cache
+if CROSS_COMPILING
+gtk_update_icon_cache_program = ./native/native-update-icon-cache
+else
+gtk_update_icon_cache_program = ./gtk-update-icon-cache$(EXEEXT)
+endif
 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)
+if CROSS_COMPILING
+       $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) -C native/
+else
+       $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
+endif
 endif
        $(AM_V_GEN) $(gtk_update_icon_cache_program) --quiet --force --ignore-theme-index               \
           --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \