r21484 - gnucash/trunk - [Gtkmm] For unittests we only need glibmm, not gtkmm.

[Christian Stimming]

Author: cstim
Date: 2011-10-24 03:59:18 -0400 (Mon, 24 Oct 2011)
New Revision: 21484
Trac: http://svn.gnucash.org/trac/changeset/21484

Modified:
   gnucash/trunk/configure.ac
   gnucash/trunk/src/optional/gtkmm/gncmm/wrap_init.cpp
   gnucash/trunk/src/optional/gtkmm/gncmod-gtkmm.cpp
   gnucash/trunk/src/optional/gtkmm/test/test-gtkmm.cpp
Log:
[Gtkmm] For unittests we only need glibmm, not gtkmm.

Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac	2011-10-23 20:43:51 UTC (rev 21483)
+++ gnucash/trunk/configure.ac	2011-10-24 07:59:18 UTC (rev 21484)
@@ -129,7 +129,7 @@
   [
     GTKMM_DIR=gtkmm
     # We require gtkmm, of course
-    PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.16)
+    PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.20)
     # and also the c++ compiler
     AC_PROG_CXXCPP
     AC_PROG_CXX

Modified: gnucash/trunk/src/optional/gtkmm/gncmm/wrap_init.cpp
===================================================================
--- gnucash/trunk/src/optional/gtkmm/gncmm/wrap_init.cpp	2011-10-23 20:43:51 UTC (rev 21483)
+++ gnucash/trunk/src/optional/gtkmm/gncmm/wrap_init.cpp	2011-10-24 07:59:18 UTC (rev 21484)
@@ -6,7 +6,7 @@
 #undef  G_GNUC_CONST
 #define G_GNUC_CONST /* empty */
 
-#include <giomm/wrap_init.h>
+//#include <giomm/wrap_init.h>
 #include <glibmm/error.h>
 #include <glibmm/object.h>
 

Modified: gnucash/trunk/src/optional/gtkmm/gncmod-gtkmm.cpp
===================================================================
--- gnucash/trunk/src/optional/gtkmm/gncmod-gtkmm.cpp	2011-10-23 20:43:51 UTC (rev 21483)
+++ gnucash/trunk/src/optional/gtkmm/gncmod-gtkmm.cpp	2011-10-24 07:59:18 UTC (rev 21484)
@@ -77,13 +77,16 @@
             return FALSE;
         }
 
+        // Initialize glibmm
+        Glib::init();
+
+        // Register our own gncmm wrapper classes at glib type system
+        gnc::wrap_init();
+
         // Initialize the gtkmm framework. Calling this static method
         // is sufficient; we don't actually need a Gtk::Main object.
         Gtk::Main::init_gtkmm_internals();
 
-        // Register our own gncmm wrapper classes at glib type system
-        gnc::wrap_init();
-
         // Register our plugin, adding menu items with callbacks
         gncmm::gnc_plugin_gtkmm_create_plugin();
 

Modified: gnucash/trunk/src/optional/gtkmm/test/test-gtkmm.cpp
===================================================================
--- gnucash/trunk/src/optional/gtkmm/test/test-gtkmm.cpp	2011-10-23 20:43:51 UTC (rev 21483)
+++ gnucash/trunk/src/optional/gtkmm/test/test-gtkmm.cpp	2011-10-24 07:59:18 UTC (rev 21484)
@@ -31,7 +31,7 @@
 //    gint libgncmod_gtkmm_gnc_module_init(gint refcount);
 }
 // c++ includes
-#include <gtkmm.h>
+//#include <gtkmm.h>
 // And our own plugin
 #include "gncmm/wrap_init.hpp"
 
@@ -47,8 +47,13 @@
     qof_log_init_filename_special("stderr"); /* Init the log system */
     g_test_bug_base("https://bugzilla.gnome.org/show_bug.cgi?id="); /* init the bugzilla URL */
 
-    Gtk::Main::init_gtkmm_internals();
+    // Initialize glibmm
+    Glib::init();
     gnc::wrap_init();
+
+    // The below only needed if we use gtkmm stuff
+    //Gtk::Main::init_gtkmm_internals();
+
     //libgncmod_gtkmm_gnc_module_init(1);
 
     test_suite_gtkmm_book();