From 60e4975cb874a245d7cddae20c6b3f3db9668021 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 24 Aug 2005 11:17:05 +0000 Subject: [PATCH 1/1] fix for -Wundef warning for HAVE_XIM under GTK1 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/window.h | 8 ++++---- include/wx/gtk1/window.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 0938985f32..9118c6b3b9 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -208,13 +208,13 @@ public: #ifdef __WXGTK20__ wxGtkIMData *m_imData; -#else -#if HAVE_XIM && !defined(__WXGTK20__) +#else // GTK 1 +#ifdef HAVE_XIM // XIM support for wxWidgets GdkIC *m_ic; GdkICAttr *m_icattr; -#endif -#endif +#endif // HAVE_XIM +#endif // GTK 2/1 #ifndef __WXGTK20__ // The area to be cleared (and not just refreshed) diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index 0938985f32..9118c6b3b9 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -208,13 +208,13 @@ public: #ifdef __WXGTK20__ wxGtkIMData *m_imData; -#else -#if HAVE_XIM && !defined(__WXGTK20__) +#else // GTK 1 +#ifdef HAVE_XIM // XIM support for wxWidgets GdkIC *m_ic; GdkICAttr *m_icattr; -#endif -#endif +#endif // HAVE_XIM +#endif // GTK 2/1 #ifndef __WXGTK20__ // The area to be cleared (and not just refreshed) -- 2.45.2