From b58b1dfc21d17ba8189c9d956562ff714d29a7e3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sat, 11 Dec 1999 21:53:57 +0000
Subject: [PATCH] fixed compilation bug with GCC 2.95.1 and GTK+ 1.2.6
(attrmask was of type GdkICAttributesType which is enum and was used in this
way : attrmask |= some constant)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/gtk/window.cpp | 4 ++--
src/gtk1/window.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 5dc903f0ca..3f6f633c0e 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1701,7 +1701,7 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
GdkEventMask mask;
GdkColormap *colormap;
GdkICAttr *attr = win->m_icattr;
- GdkICAttributesType attrmask = GDK_IC_ALL_REQ;
+ unsigned attrmask = GDK_IC_ALL_REQ;
GdkIMStyle style;
GdkIMStyle supported_style = (GdkIMStyle)
(GDK_IM_PREEDIT_NONE |
@@ -1751,7 +1751,7 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
break;
}
- win->m_ic = gdk_ic_new (attr, attrmask);
+ win->m_ic = gdk_ic_new (attr, (GdkICAttributesType)attrmask);
if (win->m_ic == NULL)
g_warning ("Can't create input context.");
diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 5dc903f0ca..3f6f633c0e 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -1701,7 +1701,7 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
GdkEventMask mask;
GdkColormap *colormap;
GdkICAttr *attr = win->m_icattr;
- GdkICAttributesType attrmask = GDK_IC_ALL_REQ;
+ unsigned attrmask = GDK_IC_ALL_REQ;
GdkIMStyle style;
GdkIMStyle supported_style = (GdkIMStyle)
(GDK_IM_PREEDIT_NONE |
@@ -1751,7 +1751,7 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
break;
}
- win->m_ic = gdk_ic_new (attr, attrmask);
+ win->m_ic = gdk_ic_new (attr, (GdkICAttributesType)attrmask);
if (win->m_ic == NULL)
g_warning ("Can't create input context.");
--
2.47.2