diff options
| -rw-r--r-- | src/fe-gtk/chanview-tabs.c | 28 | ||||
| -rw-r--r-- | src/fe-gtk/maingui.c | 4 |
2 files changed, 17 insertions, 15 deletions
diff --git a/src/fe-gtk/chanview-tabs.c b/src/fe-gtk/chanview-tabs.c index 9262323b..e2e421da 100644 --- a/src/fe-gtk/chanview-tabs.c +++ b/src/fe-gtk/chanview-tabs.c @@ -97,6 +97,7 @@ tab_search_offset (GtkWidget *inner, gint start_offset, GList *tabs; GtkWidget *box; GtkWidget *button; + GtkAllocation allocation; gint found; boxes = gtk_container_get_children (GTK_CONTAINER (inner)); @@ -120,7 +121,8 @@ tab_search_offset (GtkWidget *inner, gint start_offset, if (!GTK_IS_TOGGLE_BUTTON (button)) continue; - found = (vertical ? button->allocation.y : button->allocation.x); + gtk_widget_get_allocation (button, &allocation); + found = (vertical ? allocation.y : allocation.x); if ((forward && found > start_offset) || (!forward && found < start_offset)) return found; @@ -153,16 +155,16 @@ tab_scroll_left_up_clicked (GtkWidget *widget, chanview *cv) gdk_window_get_geometry (parent_win, 0, 0, &viewport_size, 0, 0); } - new_value = tab_search_offset (inner, adj->value, 0, cv->vertical); + new_value = tab_search_offset (inner, gtk_adjustment_get_value (adj), 0, cv->vertical); - if (new_value + viewport_size > adj->upper) - new_value = adj->upper - viewport_size; + if (new_value + viewport_size > gtk_adjustment_get_upper (adj)) + new_value = gtk_adjustment_get_upper (adj) - viewport_size; if (!tab_left_is_moving) { tab_left_is_moving = 1; - for (i = adj->value; ((i > new_value) && (tab_left_is_moving)); i -= 0.1) + for (i = gtk_adjustment_get_value (adj); ((i > new_value) && (tab_left_is_moving)); i -= 0.1) { gtk_adjustment_set_value (adj, i); while (g_main_context_pending (NULL)) @@ -202,16 +204,16 @@ tab_scroll_right_down_clicked (GtkWidget *widget, chanview *cv) gdk_window_get_geometry (parent_win, 0, 0, &viewport_size, 0, 0); } - new_value = tab_search_offset (inner, adj->value, 1, cv->vertical); + new_value = tab_search_offset (inner, gtk_adjustment_get_value (adj), 1, cv->vertical); - if (new_value == 0 || new_value + viewport_size > adj->upper) - new_value = adj->upper - viewport_size; + if (new_value == 0 || new_value + viewport_size > gtk_adjustment_get_upper (adj)) + new_value = gtk_adjustment_get_upper (adj) - viewport_size; if (!tab_right_is_moving) { tab_right_is_moving = 1; - for (i = adj->value; ((i < new_value) && (tab_right_is_moving)); i += 0.1) + for (i = gtk_adjustment_get_value (adj); ((i < new_value) && (tab_right_is_moving)); i += 0.1) { gtk_adjustment_set_value (adj, i); while (g_main_context_pending (NULL)) @@ -628,7 +630,7 @@ tab_group_for_each_tab (chanview *cv, static int tab_check_focus_cb (GtkWidget *tab, int num, int unused) { - if (GTK_TOGGLE_BUTTON (tab)->active) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (tab))) return num; return -1; @@ -766,7 +768,7 @@ cv_tabs_cleanup (chanview *cv) static void cv_tabs_set_color (chan *ch, PangoAttrList *list) { - gtk_label_set_attributes (GTK_LABEL (GTK_BIN (ch->impl)->child), list); + gtk_label_set_attributes (GTK_LABEL (gtk_bin_get_child (GTK_BIN (ch->impl))), list); } static void @@ -775,7 +777,7 @@ cv_tabs_rename (chan *ch, char *name) PangoAttrList *attr; GtkWidget *tab = ch->impl; - attr = gtk_label_get_attributes (GTK_LABEL (GTK_BIN (tab)->child)); + attr = gtk_label_get_attributes (GTK_LABEL (gtk_bin_get_child (GTK_BIN (tab)))); if (attr) pango_attr_list_ref (attr); @@ -784,7 +786,7 @@ cv_tabs_rename (chan *ch, char *name) if (attr) { - gtk_label_set_attributes (GTK_LABEL (GTK_BIN (tab)->child), attr); + gtk_label_set_attributes (GTK_LABEL (gtk_bin_get_child (GTK_BIN (tab))), attr); pango_attr_list_unref (attr); } } diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index 4177514e..4d4707ea 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -3787,9 +3787,9 @@ mg_drag_begin_cb (GtkWidget *widget, GdkDragContext *context, gpointer userdata) return FALSE; cmap = gtk_widget_get_colormap (widget); - gdk_drawable_get_size (widget->window, &width, &height); + gdk_drawable_get_size (gtk_widget_get_window (widget), &width, &height); - pix = gdk_pixbuf_get_from_drawable (NULL, widget->window, cmap, 0, 0, 0, 0, width, height); + 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); g_object_unref (pix); |