From 45b04dca21bbf25527f7975df1814cffec6800e0 Mon Sep 17 00:00:00 2001
From: tchernobog <tchernobog@3ecf2c5c-341e-0410-92b4-d18e462d057c>
Date: Sun, 30 Jan 2011 16:46:08 +0000
Subject: [PATCH] Make the project compile disabling gtk2 deprecated symbols,
 to ease migration for the upcoming gtk+-3. This need a temporary fix for
 gtkmm 2.22.0. Please remove where marked as bugfix when gtkmm will have a
 patch upstream.

git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@1352 3ecf2c5c-341e-0410-92b4-d18e462d057c
---
 configure.ac                            | 6 +++++-
 src/add_request_dialog.hh               | 1 +
 src/configure_policy_dialog.hh          | 3 ++-
 src/graphical_preferences_editor.hh     | 1 +
 src/gui_builder.cc                      | 4 +++-
 src/resources_widget.hh                 | 1 +
 src/schedulables_tree_widget.hh         | 1 +
 src/simulation_controller.cc            | 2 ++
 src/testsuite/test-cairo_widget.cc      | 2 ++
 src/testsuite/test-holt_widget.cc       | 2 ++
 src/testsuite/test-simulation_widget.cc | 2 ++
 11 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index e18fe34..7753dee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ if test -f "`pwd`/configure.ac"; then
 	-1 )
 fi
 
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -71,6 +71,10 @@ AC_CHECK_CXXFLAG([CXXFLAGS], [Wno-long-long])
 AC_CHECK_CXXFLAG([CXXFLAGS], [Wno-strict-aliasing])
 AC_CHECK_LDFLAG([LDFLAGS], [--as-needed])
 
+dnl test for deprecated Gtk+ features, since 3.0 is coming up the pipe
+AC_CHECK_CXXFLAG([CXXFLAGS], [DGTK_DISABLE_DEPRECATED])
+AC_CHECK_CXXFLAG([CXXFLAGS], [DGSEAL_ENABLE])
+
 dnl see if we've to enable debug flags
 AC_ARG_ENABLE([debug], 
     AS_HELP_STRING([--enable-debug],
diff --git a/src/add_request_dialog.hh b/src/add_request_dialog.hh
index 5c45853..91eda85 100644
--- a/src/add_request_dialog.hh
+++ b/src/add_request_dialog.hh
@@ -28,6 +28,7 @@ namespace sgpem
   class AddRequestDialog;
 }  
 
+#include <gtkmm/box.h> // Needed only due to a bug with gtkmm-2.4, v. 2.22
 #include <gtkmm/treeview.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/dialog.h>
diff --git a/src/configure_policy_dialog.hh b/src/configure_policy_dialog.hh
index 7039be2..b69ad3f 100644
--- a/src/configure_policy_dialog.hh
+++ b/src/configure_policy_dialog.hh
@@ -24,7 +24,8 @@
 #include "sgpemv2/policy_parameters.hh"
 
 #include <glibmm/ustring.h>
-#include <gtkmm/box.h>
+
+#include <gtkmm/box.h> // Needed for a bug in gtkmm 2.22
 #include <gtkmm/frame.h>
 #include <gtkmm/dialog.h>
 #include <gtkmm/table.h>
diff --git a/src/graphical_preferences_editor.hh b/src/graphical_preferences_editor.hh
index 9d317b7..eba6e02 100644
--- a/src/graphical_preferences_editor.hh
+++ b/src/graphical_preferences_editor.hh
@@ -23,6 +23,7 @@
 
 #include "sgpemv2/global_preferences.hh"
 
+#include <gtkmm/box.h> // Needed only due to a bug with gtkmm-2.4, v. 2.22
 #include <gtkmm/builder.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/dialog.h>
diff --git a/src/gui_builder.cc b/src/gui_builder.cc
index 0a14957..f850a5c 100644
--- a/src/gui_builder.cc
+++ b/src/gui_builder.cc
@@ -17,7 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with SGPEMv2. If not, see http://www.gnu.org/licenses/.
 
-
+#include <gtkmm/box.h> // Needed for a bug in gtkmm 2.22
 
 #include "gettext.h"
 
@@ -49,8 +49,10 @@
 #include <sgpemv2/serializer.hh>
 
 #include <gdkmm/pixbuf.h>
+
 #include <glibmm/markup.h>
 #include <glibmm/ustring.h>
+
 #include <gtkmm/aboutdialog.h>
 #include <gtkmm/action.h>
 #include <gtkmm/button.h>
diff --git a/src/resources_widget.hh b/src/resources_widget.hh
index 2e5a53b..42aca25 100644
--- a/src/resources_widget.hh
+++ b/src/resources_widget.hh
@@ -26,6 +26,7 @@ namespace sgpem
   class Resource;
 }
 
+#include <gtkmm/box.h> // Needed for a bug in gtkmm 2.22
 #include <gtkmm/treeview.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/menu.h>
diff --git a/src/schedulables_tree_widget.hh b/src/schedulables_tree_widget.hh
index 550e740..1d945b7 100644
--- a/src/schedulables_tree_widget.hh
+++ b/src/schedulables_tree_widget.hh
@@ -34,6 +34,7 @@ namespace sgpem
 #include "sgpemv2/schedulable.hh"
 #include "sgpemv2/request.hh"
 
+#include <gtkmm/box.h> // Needed for a bug in gtkmm 2.22
 #include <gtkmm/treeview.h>
 #include <gtkmm/treestore.h>
 #include <gtkmm/menu.h>
diff --git a/src/simulation_controller.cc b/src/simulation_controller.cc
index 5b43be8..a1f3cae 100644
--- a/src/simulation_controller.cc
+++ b/src/simulation_controller.cc
@@ -20,6 +20,8 @@
 
 #include "gettext.h"
 
+#include <gtkmm/box.h> // Needed for a bug in gtkmm 2.22
+
 #include "simulation_controller.hh"
 
 #include <sgpemv2/cpu_policy_exception.hh>
diff --git a/src/testsuite/test-cairo_widget.cc b/src/testsuite/test-cairo_widget.cc
index b7a0f22..52b5258 100644
--- a/src/testsuite/test-cairo_widget.cc
+++ b/src/testsuite/test-cairo_widget.cc
@@ -18,6 +18,8 @@
 // along with SGPEMv2. If not, see http://www.gnu.org/licenses/.
 
 
+#include <gtkmm/box.h> // Needed for a bug in gtkmm 2.22
+
 #include "cairo_widget.hh"
 #include "cairo_elements.hh"
 #include "gettext.h"
diff --git a/src/testsuite/test-holt_widget.cc b/src/testsuite/test-holt_widget.cc
index 97184c9..873cb3a 100644
--- a/src/testsuite/test-holt_widget.cc
+++ b/src/testsuite/test-holt_widget.cc
@@ -24,6 +24,8 @@
 
 #include "gettext.h"
 
+#include <gtkmm/box.h> // Needed for a bug in gtkmm 2.22
+
 #include "cairo_elements.hh"
 #include "cairo_widget.hh"
 #include "holt_container_window.hh"
diff --git a/src/testsuite/test-simulation_widget.cc b/src/testsuite/test-simulation_widget.cc
index 41b725c..e82d836 100644
--- a/src/testsuite/test-simulation_widget.cc
+++ b/src/testsuite/test-simulation_widget.cc
@@ -24,6 +24,8 @@
 
 #include "gettext.h"
 
+#include <gtkmm/box.h> // Needed for a bug in gtkmm 2.22
+
 #include "sgpemv2/cpu_policies_gatekeeper.hh"
 #include "sgpemv2/cpu_policy.hh"
 #include "sgpemv2/cpu_policy_manager.hh"