diff options
| -rw-r--r-- | src/applet-main.c | 10 | ||||
| -rw-r--r-- | src/eggaccelerators.c | 4 | ||||
| -rw-r--r-- | src/eggaccelerators.h | 3 | ||||
| -rw-r--r-- | src/tomboykeybinder.c | 6 |
4 files changed, 14 insertions, 9 deletions
diff --git a/src/applet-main.c b/src/applet-main.c index 06a17c1..995552c 100644 --- a/src/applet-main.c +++ b/src/applet-main.c @@ -554,11 +554,13 @@ hotkey_filter (char * keystring G_GNUC_UNUSED, gpointer data) return; } +#if !GTK_CHECK_VERSION(3,0,0) if (!GTK_MENU_SHELL(data)->active) { gtk_grab_add (GTK_WIDGET(data)); GTK_MENU_SHELL(data)->have_grab = TRUE; GTK_MENU_SHELL(data)->active = TRUE; } +#endif gtk_menu_shell_select_item(GTK_MENU_SHELL(data), GTK_WIDGET(g_list_last(children)->data)); g_list_free(children); @@ -582,8 +584,8 @@ menubar_on_expose (GtkWidget * widget, GdkEventExpose *event G_GNUC_UNUSED, GtkWidget * menubar) { - if (GTK_WIDGET_HAS_FOCUS(menubar)) - gtk_paint_focus(widget->style, widget->window, GTK_WIDGET_STATE(menubar), + if (gtk_widget_has_focus(menubar)) + gtk_paint_focus(gtk_widget_get_style(widget), gtk_widget_get_window(widget), gtk_widget_get_state(menubar), NULL, widget, "menubar-applet", 0, 0, -1, -1); return FALSE; @@ -859,7 +861,7 @@ applet_fill_cb (MatePanelApplet * applet, const gchar * iid G_GNUC_UNUSED, GTK_PACK_DIRECTION_LTR : GTK_PACK_DIRECTION_TTB; gtk_menu_bar_set_pack_direction(GTK_MENU_BAR(menubar), packdirection); - GTK_WIDGET_SET_FLAGS (menubar, GTK_WIDGET_FLAGS(menubar) | GTK_CAN_FOCUS); + gtk_widget_set_can_focus (menubar, TRUE); gtk_widget_set_name(GTK_WIDGET (menubar), "fast-user-switch-menubar"); g_signal_connect(menubar, "button-press-event", G_CALLBACK(menubar_press), NULL); g_signal_connect_after(menubar, "expose-event", G_CALLBACK(menubar_on_expose), menubar); @@ -949,7 +951,7 @@ cw_panel_background_changed (MatePanelApplet *applet, break; case PANEL_PIXMAP_BACKGROUND: - style = gtk_style_copy(GTK_WIDGET (applet)->style); + style = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(applet))); if (style->bg_pixmap[GTK_STATE_NORMAL]) g_object_unref(style->bg_pixmap[GTK_STATE_NORMAL]); style->bg_pixmap[GTK_STATE_NORMAL] = g_object_ref (pixmap); diff --git a/src/eggaccelerators.c b/src/eggaccelerators.c index 5410259..804615e 100644 --- a/src/eggaccelerators.c +++ b/src/eggaccelerators.c @@ -21,7 +21,11 @@ #include <string.h> #include <gdk/gdkx.h> +#if GTK_CHECK_VERSION(3,0,0) +#include <gdk/gdkkeysyms-compat.h> +#else #include <gdk/gdkkeysyms.h> +#endif enum { diff --git a/src/eggaccelerators.h b/src/eggaccelerators.h index 18e3ae0..1da4a07 100644 --- a/src/eggaccelerators.h +++ b/src/eggaccelerators.h @@ -20,8 +20,7 @@ #ifndef __EGG_ACCELERATORS_H__ #define __EGG_ACCELERATORS_H__ -#include <gtk/gtkaccelgroup.h> -#include <gdk/gdk.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/src/tomboykeybinder.c b/src/tomboykeybinder.c index 7aa7168..29a8e27 100644 --- a/src/tomboykeybinder.c +++ b/src/tomboykeybinder.c @@ -86,7 +86,7 @@ grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin, XGrabKey (GDK_WINDOW_XDISPLAY (rootwin), binding->keycode, binding->modifiers | mod_masks [i], - GDK_WINDOW_XWINDOW (rootwin), + GDK_WINDOW_XID (rootwin), False, GrabModeAsync, GrabModeAsync); @@ -94,7 +94,7 @@ grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin, XUngrabKey (GDK_WINDOW_XDISPLAY (rootwin), binding->keycode, binding->modifiers | mod_masks [i], - GDK_WINDOW_XWINDOW (rootwin)); + GDK_WINDOW_XID (rootwin)); } } } @@ -312,7 +312,7 @@ tomboy_keybinder_is_modifier (guint keycode) XModifierKeymap *mod_keymap; gboolean retval = FALSE; - mod_keymap = XGetModifierMapping (gdk_display); + mod_keymap = XGetModifierMapping (gdk_x11_get_default_xdisplay()); map_size = 8 * mod_keymap->max_keypermod; |