[gtkmm] Action, etc: Avoid C API deprecation warnings.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Action, etc: Avoid C API deprecation warnings.
- Date: Wed, 9 Oct 2013 09:33:24 +0000 (UTC)
commit 703ed58490eedd704c9f888e8a18efbd58da8549
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Oct 9 11:26:31 2013 +0200
Action, etc: Avoid C API deprecation warnings.
gtk/gtkmm/radiobuttongroup.cc | 3 +++
gtk/src/action.hg | 8 ++++++++
gtk/src/actiongroup.hg | 6 ++++++
gtk/src/activatable.hg | 8 ++++++++
gtk/src/radioaction.hg | 7 +++++++
gtk/src/recentaction.hg | 7 +++++++
gtk/src/toggleaction.hg | 7 +++++++
gtk/src/uimanager.hg | 3 +++
8 files changed, 49 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkmm/radiobuttongroup.cc b/gtk/gtkmm/radiobuttongroup.cc
index ec8f72c..7891d5f 100644
--- a/gtk/gtkmm/radiobuttongroup.cc
+++ b/gtk/gtkmm/radiobuttongroup.cc
@@ -17,6 +17,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#undef GTK_DISABLE_DEPRECATED
+#define GDK_DISABLE_DEPRECATION_WARNINGS 1
+
#include <gtkmm/radiobuttongroup.h>
#include <gtkmm/radiobutton.h>
diff --git a/gtk/src/action.hg b/gtk/src/action.hg
index 40636b1..9a5a632 100644
--- a/gtk/src/action.hg
+++ b/gtk/src/action.hg
@@ -27,6 +27,14 @@ _CONFIGINCLUDE(gtkmmconfig.h)
_DEFS(gtkmm,gtk)
_PINCLUDE(glibmm/private/object_p.h)
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#define GDK_DISABLE_DEPRECATION_WARNINGS 1
+#m4 _POP()
+
+//TODO: Deprecate this when we are ready. It is already deprecated in GTK+.
+//_IS_DEPRECATED // This whole file is deprecated.
+
namespace Gtk
{
diff --git a/gtk/src/actiongroup.hg b/gtk/src/actiongroup.hg
index 4cad9c3..ea8e3ad 100644
--- a/gtk/src/actiongroup.hg
+++ b/gtk/src/actiongroup.hg
@@ -25,6 +25,12 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(glibmm/private/object_p.h)
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#define GDK_DISABLE_DEPRECATION_WARNINGS 1
+#m4 _POP()
+
+_IS_DEPRECATED // This whole file is deprecated.
namespace Gtk
{
diff --git a/gtk/src/activatable.hg b/gtk/src/activatable.hg
index cae7e84..5b35360 100644
--- a/gtk/src/activatable.hg
+++ b/gtk/src/activatable.hg
@@ -20,6 +20,14 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(glibmm/private/interface_p.h)
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#define GDK_DISABLE_DEPRECATION_WARNINGS 1
+#m4 _POP()
+
+//TODO: Do this when we can stop using this as a base class elsewhere, when we break ABI:
+//_IS_DEPRECATED // This whole file is deprecated.
+
#ifndef DOXYGEN_SHOULD_SKIP_THIS
extern "C"
{
diff --git a/gtk/src/radioaction.hg b/gtk/src/radioaction.hg
index 082d3d3..d507709 100644
--- a/gtk/src/radioaction.hg
+++ b/gtk/src/radioaction.hg
@@ -21,6 +21,13 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/toggleaction_p.h)
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#define GDK_DISABLE_DEPRECATION_WARNINGS 1
+#m4 _POP()
+
+//TODO: Deprecate this when we are ready. It is already deprecated in GTK+.
+//_IS_DEPRECATED // This whole file is deprecated.
namespace Gtk
{
diff --git a/gtk/src/recentaction.hg b/gtk/src/recentaction.hg
index 6430873..bfe4222 100644
--- a/gtk/src/recentaction.hg
+++ b/gtk/src/recentaction.hg
@@ -23,6 +23,13 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/action_p.h)
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#define GDK_DISABLE_DEPRECATION_WARNINGS 1
+#m4 _POP()
+
+//TODO: Deprecate this when we are ready. It is already deprecated in GTK+.
+//_IS_DEPRECATED // This whole file is deprecated.
namespace Gtk
{
diff --git a/gtk/src/toggleaction.hg b/gtk/src/toggleaction.hg
index 1015f4c..a6243ea 100644
--- a/gtk/src/toggleaction.hg
+++ b/gtk/src/toggleaction.hg
@@ -20,6 +20,13 @@
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/action_p.h)
+#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
+#undef GTK_DISABLE_DEPRECATED
+#define GDK_DISABLE_DEPRECATION_WARNINGS 1
+#m4 _POP()
+
+//TODO: Deprecate this when we are ready. It is already deprecated in GTK+.
+//_IS_DEPRECATED // This whole file is deprecated.
namespace Gtk
{
diff --git a/gtk/src/uimanager.hg b/gtk/src/uimanager.hg
index 3bbf483..2935103 100644
--- a/gtk/src/uimanager.hg
+++ b/gtk/src/uimanager.hg
@@ -30,6 +30,9 @@ _PINCLUDE(glibmm/private/object_p.h)
#define GDK_DISABLE_DEPRECATION_WARNINGS 1
#m4 _POP()
+//TODO: Deprecate this when we are ready. It is already deprecated in GTK+.
+//_IS_DEPRECATED // This whole file is deprecated.
+
namespace Gtk
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]