Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-12-11 21:53:57 +00:00
parent 6c3d9ced08
commit b58b1dfc21
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/window.cpp
View File

@@ -1701,7 +1701,7 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
GdkEventMask mask; GdkEventMask mask;
GdkColormap *colormap; GdkColormap *colormap;
GdkICAttr *attr = win->m_icattr; GdkICAttr *attr = win->m_icattr;
GdkICAttributesType attrmask = GDK_IC_ALL_REQ; unsigned attrmask = GDK_IC_ALL_REQ;
GdkIMStyle style; GdkIMStyle style;
GdkIMStyle supported_style = (GdkIMStyle) GdkIMStyle supported_style = (GdkIMStyle)
(GDK_IM_PREEDIT_NONE | (GDK_IM_PREEDIT_NONE |
@@ -1751,7 +1751,7 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
break; break;
} }
win->m_ic = gdk_ic_new (attr, attrmask); win->m_ic = gdk_ic_new (attr, (GdkICAttributesType)attrmask);
if (win->m_ic == NULL) if (win->m_ic == NULL)
g_warning ("Can't create input context."); g_warning ("Can't create input context.");

4
src/gtk1/window.cpp
View File

@@ -1701,7 +1701,7 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
GdkEventMask mask; GdkEventMask mask;
GdkColormap *colormap; GdkColormap *colormap;
GdkICAttr *attr = win->m_icattr; GdkICAttr *attr = win->m_icattr;
GdkICAttributesType attrmask = GDK_IC_ALL_REQ; unsigned attrmask = GDK_IC_ALL_REQ;
GdkIMStyle style; GdkIMStyle style;
GdkIMStyle supported_style = (GdkIMStyle) GdkIMStyle supported_style = (GdkIMStyle)
(GDK_IM_PREEDIT_NONE | (GDK_IM_PREEDIT_NONE |
@@ -1751,7 +1751,7 @@ gtk_wxwindow_realized_callback( GtkWidget *widget, wxWindow *win )
break; break;
} }
win->m_ic = gdk_ic_new (attr, attrmask); win->m_ic = gdk_ic_new (attr, (GdkICAttributesType)attrmask);
if (win->m_ic == NULL) if (win->m_ic == NULL)
g_warning ("Can't create input context."); g_warning ("Can't create input context.");