[gtkmm] gdk/src/enums.hg: Shadow DELETE macro
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] gdk/src/enums.hg: Shadow DELETE macro
- Date: Mon, 29 May 2017 14:58:54 +0000 (UTC)
commit 0d5b1aac29747db16a2e42483a25931a5e1c36e5
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Mon May 29 16:50:29 2017 +0200
gdk/src/enums.hg: Shadow DELETE macro
Like in event.hg, the DELETE macro from winnt.h interferes with an enumerator.
Bug 135978
gdk/src/enums.hg | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/gdk/src/enums.hg b/gdk/src/enums.hg
index 99ca946..d99d153 100644
--- a/gdk/src/enums.hg
+++ b/gdk/src/enums.hg
@@ -19,6 +19,17 @@
_DEFS(gdkmm,gdk)
+/* Shadow DELETE macro (from winnt.h).
+ * It interferes with Gdk::PropertyState::DELETE.
+ */
+#if defined(DELETE) && !defined(GTKMM_MACRO_SHADOW_DELETE)
+enum { GTKMM_MACRO_DEFINITION_DELETE = DELETE };
+#undef DELETE
+enum { DELETE = GTKMM_MACRO_DEFINITION_DELETE };
+#define DELETE DELETE
+#define GTKMM_MACRO_SHADOW_DELETE 1
+#endif
+
namespace Gdk
{
_WRAP_ENUM(AxisFlags, GdkAxisFlags)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]