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

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 0938985f32bf13063028d160f1cfd6099eda313c..9118c6b3b9a3cbdb817730710f83a5a79eee0d4b 100644 (file)
--- 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 0938985f32bf13063028d160f1cfd6099eda313c..9118c6b3b9a3cbdb817730710f83a5a79eee0d4b 100644 (file)
--- 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)