fixed compilation bug with GCC 2.95.1 and GTK+ 1.2.6 (attrmask was of type GdkICAttri...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 5dc903f0caeae35f7da085299e6d690e792af582..3f6f633c0e5d63eeec8213ad12173ccf8c1491b7 100644 (file)
--- 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 5dc903f0caeae35f7da085299e6d690e792af582..3f6f633c0e5d63eeec8213ad12173ccf8c1491b7 100644 (file)
--- 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.");