diff options
| author | TingPing <tingping@tingping.se> | 2014-01-18 03:06:33 -0500 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2014-01-18 14:47:17 -0500 |
| commit | fa1eb92a7bc17e9e3ae3809851588ea5842df292 (patch) | |
| tree | f30e76dba6c9ca9d7ec164ca3318f67143fc8875 /src/fe-gtk/maingui.c | |
| parent | eb29de1c7c77daf9ff073c40e0e9b6ab74962df6 (diff) | |
Update most deprecated gdk functions
Diffstat (limited to 'src/fe-gtk/maingui.c')
| -rw-r--r-- | src/fe-gtk/maingui.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index c2308621..16425def 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -1593,7 +1593,7 @@ mg_create_tabmenu (session *sess, GdkEventButton *event, chan *ch) menu_add_plugin_items (menu, "\x4$TAB", sess->channel); if (event->window) - gtk_menu_set_screen (GTK_MENU (menu), gdk_drawable_get_screen (event->window)); + gtk_menu_set_screen (GTK_MENU (menu), gdk_window_get_screen (event->window)); g_object_ref (menu); g_object_ref_sink (menu); g_object_unref (menu); @@ -3715,7 +3715,7 @@ mg_handle_drop (GtkWidget *widget, int y, int *pos, int *other_pos) int height; session_gui *gui = current_sess->gui; - gdk_drawable_get_size (gtk_widget_get_window (widget), NULL, &height); + height = gdk_window_get_height (gtk_widget_get_window (widget)); if (y < height / 2) { @@ -3794,7 +3794,8 @@ mg_drag_begin_cb (GtkWidget *widget, GdkDragContext *context, gpointer userdata) return FALSE; cmap = gtk_widget_get_colormap (widget); - gdk_drawable_get_size (gtk_widget_get_window (widget), &width, &height); + width = gdk_window_get_width (gtk_widget_get_window (widget)); + height = gdk_window_get_height (gtk_widget_get_window (widget)); pix = gdk_pixbuf_get_from_drawable (NULL, gtk_widget_get_window (widget), cmap, 0, 0, 0, 0, width, height); pix2 = gdk_pixbuf_scale_simple (pix, width * 4 / 5, height / 2, GDK_INTERP_HYPER); @@ -3874,7 +3875,8 @@ mg_drag_motion_cb (GtkWidget *widget, GdkDragContext *context, int x, int y, gui else { ox = oy = 0; - gdk_drawable_get_size (gtk_widget_get_window (widget), &width, &height); + width = gdk_window_get_width (gtk_widget_get_window (widget)); + height = gdk_window_get_height (gtk_widget_get_window (widget)); draw = gtk_widget_get_window (widget); } |