Use GTK+ 2.14.1

What's new in GTK+ 2.14
=======================

GTK+ 2.14 adds new functionality while maintaining source and binary 
compatibility with GTK+ 2.12. Highlights of new features and
improvements in GTK+ 2.14 are:

New widgets and objects

 * GdkAppLaunchContext, provides startup notification with 
   g_app_info_launch()
 * GtkMountOperation, can ask for passwords when mounting 
   volumes with g_volume_mount()
 * GtkToolShell, an interface for containers of GtkToolItems

Noteworthy new APIs
 
 * gtk_show_uri(), a replacement for gnome_vfs_url_show() and
   gnome_url_show()
 * gtk_widget_get_snapshot(), using pixmap redirection to render 
   snapshots of widgets

Changes in the file chooser

 The file chooser uses GIO directly, loadable backends are no longer 
 supported. Autocompletion in the file chooser entry has been improved.

Changes in printing support
 
 The print dialog displays printer status information. Support for
 rearranging pages when printing multiple pages per sheet has been
 added to the cups backend. 

Accessibility support
 
 The gail module is shipped with GTK+, GtkBuilder supports
 accessibility attributes and GtkStatusIcon supports keyboard
 navigation.

Internationalization support

 The compose sequences understood by GTK+'s builtin input method
 have been synchronized with recent X.org compose sequences, adding
 a large number of new sequences. GTK+ no longer uses translations
 when an application is not translated to the current locale.

gdk-pixbuf changes

 * Support loading OS X icns format
 * Support loading JPEG 2000 images
 * Support loading and saving to GIO streams
 * Use GIO for mime information
 
GDK changes

 GDK uses Xrandr instead of Xinerama to provide more (and dynamic)
 monitor information. Font configuration changes are now picked up
 at runtime, without an application restart.

For more details and lists of fixed bugs, see the
announcements for the 2.13.x development releases:

http://mail.gnome.org/archives/gtk-devel-list/2008-February/msg00079.html
http://mail.gnome.org/archives/gtk-devel-list/2008-May/msg00112.html
http://mail.gnome.org/archives/gtk-devel-list/2008-June/msg00033.html
http://mail.gnome.org/archives/gtk-devel-list/2008-June/msg00158.html
http://mail.gnome.org/archives/gtk-devel-list/2008-July/msg00044.html
http://mail.gnome.org/archives/gtk-devel-list/2008-July/msg00182.html
http://mail.gnome.org/archives/gtk-devel-list/2008-August/msg00023.html
http://mail.gnome.org/archives/gtk-devel-list/2008-August/msg00153.html

svn path=/trunk/; revision=26148

1 files changed, 29 insertions, 28 deletions

diff --git a/Makefile.nmake b/Makefile.nmake
index 7d12126b53..294506be89 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -700,16 +700,16 @@ process_libs:
     @$(SH) tools\win32-setup.sh --checktag "$(WIRESHARK_LIBS)"
 !ENDIF
     if not exist $(WIRESHARK_LIBS) md $(WIRESHARK_LIBS)
-!IF "$(GTK_INST_VERSION)" == "2.12"
+!IF "$(GTK_INST_VERSION)" == "2.14"
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
 		glib gtk2.12/glib_2.18.0-1_win32.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
 		glib gtk2.12/glib-dev_2.18.0-1_win32.zip
-!ELSEIF "$(GTK_INST_VERSION)" == "2.10"
+!ELSEIF "$(GTK_INST_VERSION)" == "2.12"
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		glib gtk2.10/glib-2.12.13.zip
+		glib gtk2.12/glib_2.18.0-1_win32.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		glib gtk2.10/glib-dev-2.12.13.zip
+		glib gtk2.12/glib-dev_2.18.0-1_win32.zip
 !ELSE
 !ERROR ? Unknown or invalid GTK_INST_VERSION
 !ENDIF
@@ -768,7 +768,26 @@ process_libs:
 !ENDIF
 
 !IFDEF GTK_DIR
-!IF "$(GTK_INST_VERSION)" == "2.12"
+!IF "$(GTK_INST_VERSION)" == "2.14"
+	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+		gtk2 gtk2.14/gtk+_2.14.1-1_win32.zip
+	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+		gtk2 gtk2.14/gtk+-dev_2.14.1-1_win32.zip
+	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+		gtk2 gtk2.14/cairo-1.6.4-2.zip
+	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+		gtk2 gtk2.14/cairo-dev-1.6.4-2.zip
+	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+		gtk2 gtk2.14/atk-1.22.0.zip
+	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+		gtk2 gtk2.14/atk-dev-1.22.0.zip
+	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+		gtk2 gtk2.14/libpng-1.2.29.zip
+	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+		gtk2 gtk2.14/tiff-3.8.2-1-bin.zip
+	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
+		gtk2 gtk2.14/jpeg-6b-4-bin.zip
+!ELSEIF "$(GTK_INST_VERSION)" == "2.12"
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
 		gtk2 gtk2.12/gtk+-2.12.11.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@@ -787,21 +806,6 @@ process_libs:
 		gtk2 gtk2.12/tiff-3.8.2-1-bin.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
 		gtk2 gtk2.12/jpeg-6b-4-bin.zip
-!ELSEIF "$(GTK_INST_VERSION)" == "2.10"
-	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.10/gtk+-2.10.14.zip
-	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.10/gtk+-dev-2.10.14.zip
-	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.10/cairo-1.4.8.zip
-	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.10/cairo-dev-1.4.8.zip
-	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.10/atk-1.18.0.zip
-	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.10/atk-dev-1.18.0.zip
-	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.10/libpng-1.2.8-bin.zip
 !ELSE
 !ERROR ? Unknown or invalid GTK_INST_VERSION
 !ENDIF
@@ -810,11 +814,6 @@ process_libs:
 		gtk2 gtk2.12/pango-1.20.5.zip
 	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
 		gtk2 gtk2.12/pango-dev-1.20.5.zip
-!ELSEIF "$(PANGO_INST_VERSION)" == "1.16"
-	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.10/pango-1.16.4.zip
-	@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
-		gtk2 gtk2.10/pango-dev-1.16.4.zip
 !ELSE
 !ERROR ? Unknown or invalid PANGO_INST_VERSION
 !ENDIF
@@ -1015,8 +1014,9 @@ install-all: install-generated-files
 #	if not exist $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules mkdir $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules
 	xcopy $(GTK_DIR)\etc\gtk-2.0\*.* $(INSTALL_DIR)\etc\gtk-2.0 /d
 	xcopy $(GTK_DIR)\etc\pango\pango.* $(INSTALL_DIR)\etc\pango /d
-	xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders\libpixbufloader-*.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders /d
-	xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules\im-*.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules /d
+#	xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders\libpixbufloader-*.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders /d
+	xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\engines\libpixmap.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders /d
+#	xcopy $(GTK_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules\im-*.dll $(INSTALL_DIR)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules /d
 #	xcopy $(GTK_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules\pango-*.dll $(INSTALL_DIR)\lib\pango\$(PANGO_LIB_DIR)\modules /d
 !IFDEF NEED_LIBPNG_DLL
 #	xcopy $(GTK_DIR)\bin\libpng13.dll $(INSTALL_DIR) /d
@@ -1036,9 +1036,10 @@ install-all: install-generated-files
 	xcopy "$(GTK_WIMP_DLLSRC_DIR)\libwimp.dll" $(INSTALL_DIR)\$(GTK_WIMP_DLLDST_DIR) /d
 	if not exist $(INSTALL_DIR)\$(GTK_WIMP_RCDST_DIR) mkdir $(INSTALL_DIR)\$(GTK_WIMP_RCDST_DIR)
 	xcopy "$(GTK_WIMP_RCSRC_DIR)\gtkrc" $(INSTALL_DIR)\$(GTK_WIMP_RCDST_DIR) /d
+	xcopy $(GLIB_DIR)\bin\libgio-2.0-0.dll $(INSTALL_DIR) /d
 	xcopy $(GLIB_DIR)\bin\libglib-2.0-0.dll $(INSTALL_DIR) /d
-	xcopy $(GLIB_DIR)\bin\libgobject-2.0-0.dll $(INSTALL_DIR) /d
 	xcopy $(GLIB_DIR)\bin\libgmodule-2.0-0.dll $(INSTALL_DIR) /d
+	xcopy $(GLIB_DIR)\bin\libgobject-2.0-0.dll $(INSTALL_DIR) /d
 !IFDEF ICONV_DIR
 	xcopy $(ICONV_DIR)\bin\iconv.dll $(INSTALL_DIR) /d
 !ENDIF