[Gtkmm] For unittests we only need glibmm, not gtkmm.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21484 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2011-10-24 07:59:18 +00:00
parent 0a2a3f2756
commit 5a2b27c233
4 changed files with 15 additions and 7 deletions

View File

@ -129,7 +129,7 @@ AS_IF([test x${enable_GTKMM} = "xtrue"],
[
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

View File

@ -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>

View File

@ -77,13 +77,16 @@ extern "C" {
return FALSE;
}
// Initialize the gtkmm framework. Calling this static method
// is sufficient; we don't actually need a Gtk::Main object.
Gtk::Main::init_gtkmm_internals();
// 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 plugin, adding menu items with callbacks
gncmm::gnc_plugin_gtkmm_create_plugin();

View File

@ -31,7 +31,7 @@ extern "C" {
// 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 @@ main (int argc,
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();