gtkmm r960 - in trunk: . gtk gtk/src

[murrayc svn gnome org]

Author: murrayc
Date: Tue Jan 29 12:57:00 2008
New Revision: 960
URL: http://svn.gnome.org/viewvc/gtkmm?rev=960&view=rev

Log:
2008-01-29  Murray Cumming  <murrayc murrayc com>

* configure.in:
* gtk/gtkmm-2.4.pc.in:
* gtk/gtkmm.h:
* gtk/src/main.ccg: Depend on giomm and initialize it in 
Gtk::Main, for convenience. Note that GTK+ already depends on 
gio.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gtk/gtkmm-2.4.pc.in
   trunk/gtk/gtkmm.h
   trunk/gtk/src/main.ccg

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jan 29 12:57:00 2008
@@ -198,6 +198,7 @@
 #  Dependancy checks
 #########################################################################
 gtkmm_min_glibmm_version=2.14.1
+gtkmm_min_giomm_version=2.15.3
 gtkmm_min_gtk_version=2.12.0
 gtkmm_min_cairomm_version=1.1.12
 
@@ -225,9 +226,9 @@
 # Only check for gtk+-unix-print-2.0 on non-win32 platform, as 
 # gtk+-unix-print-2.0.pc is not always included in win32 installers. 
 if test x"$os_win32" = xyes; then
-  PKG_CHECK_MODULES(GTKMM, glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version})
+  PKG_CHECK_MODULES(GTKMM, glibmm-2.4 >= ${gtkmm_min_glibmm_version} giomm-2.4 >= ${gtkmm_min_giomm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version})
 else
-  PKG_CHECK_MODULES(GTKMM, glibmm-2.4 >= ${gtkmm_min_glibmm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version} gtk+-unix-print-2.0 >= ${gtkmm_min_gtk_version})
+  PKG_CHECK_MODULES(GTKMM, glibmm-2.4 >= ${gtkmm_min_glibmm_version} giomm-2.4 >= ${gtkmm_min_giomm_version} cairomm-1.0 >= ${gtkmm_min_cairomm_version} gtk+-2.0 >= ${gtkmm_min_gtk_version} gtk+-unix-print-2.0 >= ${gtkmm_min_gtk_version})
 fi
 AC_SUBST(GTKMM_CFLAGS)
 AC_SUBST(GTKMM_LIBS)

Modified: trunk/gtk/gtkmm-2.4.pc.in
==============================================================================
--- trunk/gtk/gtkmm-2.4.pc.in	(original)
+++ trunk/gtk/gtkmm-2.4.pc.in	Tue Jan 29 12:57:00 2008
@@ -5,7 +5,7 @@
 
 Name: gtkmm
 Description: C++ wrapper for GTK+
-Requires: glibmm-2.4 gdkmm-2.4 pangomm-1.4 @GTKMM_PC_ATKMM_DEP@ gtk+-2.0
+Requires: glibmm-2.4 giomm-2.4 gdkmm-2.4 pangomm-1.4 @GTKMM_PC_ATKMM_DEP@ gtk+-2.0
 Version: @VERSION@
 Libs: -L${libdir} -lgtkmm-2.4
 Cflags: -I${includedir}/gtkmm-2.4 -I${libdir}/gtkmm-2.4/include

Modified: trunk/gtk/gtkmm.h
==============================================================================
--- trunk/gtk/gtkmm.h	(original)
+++ trunk/gtk/gtkmm.h	Tue Jan 29 12:57:00 2008
@@ -27,6 +27,7 @@
 extern const int gtkmm_micro_version;
 
 #include <glibmm.h>
+#include <giomm.h>
 #include <gdkmm.h>
 
 #include <gtkmm/object.h>

Modified: trunk/gtk/src/main.ccg
==============================================================================
--- trunk/gtk/src/main.ccg	(original)
+++ trunk/gtk/src/main.ccg	Tue Jan 29 12:57:00 2008
@@ -25,6 +25,7 @@
 #include <gtkmm/main.h>
 #include <gtkmm/window.h>
 #include <glibmm/init.h>
+#include <giomm/init.h>
 #include <pangomm/wrap_init.h>
 #ifdef GTKMM_ATKMM_ENABLED
 #include <atkmm/wrap_init.h>
@@ -440,6 +441,7 @@
   if(!init_done)
   {
     Glib::init();
+    Gio::init();
 
     // Populate the map of GTypes to C++ wrap_new() functions.
     Pango::wrap_init();