--- abi/src/af/ev/unix/gnome/ev_UnixGnomeMenu.cpp.gcc296 Fri Jun 9 16:59:57 2000 +++ abi/src/af/ev/unix/gnome/ev_UnixGnomeMenu.cpp Fri Jun 9 17:07:32 2000 @@ -265,17 +265,17 @@ return; if (strncmp (str, "Ctrl+", 5) == 0) { - ac_mods |= GDK_CONTROL_MASK; + ac_mods = (GdkModifierType)(ac_mods|GDK_CONTROL_MASK); str += 5; } if (strncmp (str, "Alt+", 4) == 0) { - ac_mods |= GDK_MOD1_MASK; + ac_mods = (GdkModifierType)(ac_mods|GDK_MOD1_MASK); str += 4; } if (strncmp (str, "Shift+", 6) == 0) { - ac_mods |= GDK_SHIFT_MASK; + ac_mods = (GdkModifierType)(ac_mods|GDK_SHIFT_MASK); str += 6; } @@ -345,7 +345,7 @@ retval[i].label = g_strdup (buf); retval[i].hint = g_strdup (tooltip); - retval[i].moreinfo = menuEvent; + retval[i].moreinfo = (void*)menuEvent; retval[i].user_data = g_malloc (sizeof(__Aux)); ((__Aux *) retval[i].user_data)->me = this; ((__Aux *) retval[i].user_data)->id = id; --- abi/src/af/xap/unix/gnome/xap_UnixGnomeFrame.cpp.gcc296 Fri Jun 9 17:09:16 2000 +++ abi/src/af/xap/unix/gnome/xap_UnixGnomeFrame.cpp Fri Jun 9 17:09:53 2000 @@ -160,7 +160,7 @@ m_pUnixApp->getApplicationName()); gtk_drag_dest_set (m_wTopLevelWindow, - GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, + (GtkDestDefaults)(GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP), drag_types, n_drag_types, GDK_ACTION_COPY); gtk_signal_connect(GTK_OBJECT(m_wTopLevelWindow), "drag_data_received",