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
This commit is contained in:
tchernobog 2011-01-30 16:46:08 +00:00
parent a537d60571
commit 45b04dca21
11 changed files with 22 additions and 3 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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