diff options
| author | Stefano Karapetsas <[email protected]> | 2014-01-24 16:18:21 +0100 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-01-24 16:18:21 +0100 |
| commit | 7a85b88520c3e919f652af3486b055c7f71a10ae (patch) | |
| tree | 0fe44abe2e80aa1f8831a074b16a910ce4f9a19d /capplets/windows | |
| parent | c0d97d196ab43b214648dde0af05bd1b40033fce (diff) | |
| download | mate-control-center-7a85b88520c3e919f652af3486b055c7f71a10ae.tar.bz2 mate-control-center-7a85b88520c3e919f652af3486b055c7f71a10ae.tar.xz | |
windows: Add GTK3 support
Diffstat (limited to 'capplets/windows')
| -rw-r--r-- | capplets/windows/mate-window-properties.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/capplets/windows/mate-window-properties.c b/capplets/windows/mate-window-properties.c index 34613d36..c653c9db 100644 --- a/capplets/windows/mate-window-properties.c +++ b/capplets/windows/mate-window-properties.c @@ -345,7 +345,7 @@ update_wm (GdkScreen *screen, } for (i = 0; i < n_double_click_actions; i++) { - gtk_combo_box_append_text (GTK_COMBO_BOX (double_click_titlebar_optionmenu), + gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (double_click_titlebar_optionmenu), double_click_actions[i].human_readable_name); } @@ -573,16 +573,28 @@ reload_mouse_modifiers (void) int min_keycode, max_keycode; int mod_meta, mod_super, mod_hyper; +#if GTK_CHECK_VERSION (3, 0, 0) + XDisplayKeycodes (gdk_x11_display_get_xdisplay(gdk_display_get_default()), +#else XDisplayKeycodes (gdk_display, +#endif &min_keycode, &max_keycode); +#if GTK_CHECK_VERSION (3, 0, 0) + keymap = XGetKeyboardMapping (gdk_x11_display_get_xdisplay(gdk_display_get_default()), +#else keymap = XGetKeyboardMapping (gdk_display, +#endif min_keycode, max_keycode - min_keycode, &keysyms_per_keycode); +#if GTK_CHECK_VERSION (3, 0, 0) + modmap = XGetModifierMapping (gdk_x11_display_get_xdisplay(gdk_display_get_default())); +#else modmap = XGetModifierMapping (gdk_display); +#endif have_super = FALSE; have_meta = FALSE; |