static void
gtk_win32_embed_widget_map (GtkWidget *widget)
{
- GtkBin *bin = GTK_BIN (widget);
-
+ GtkBin *bin = GTK_BIN (widget);
+ GtkWidget *child;
+
gtk_widget_set_mapped (widget, TRUE);
-
- if (bin->child &&
- gtk_widget_get_visible (bin->child) &&
- !gtk_widget_get_mapped (bin->child))
- gtk_widget_map (bin->child);
+
+ child = gtk_bin_get_child (bin);
+ if (child &&
+ gtk_widget_get_visible (child) &&
+ !gtk_widget_get_mapped (child))
+ gtk_widget_map (child);
gdk_window_show (widget->window);
}
gtk_win32_embed_widget_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
- GtkBin *bin = GTK_BIN (widget);
+ GtkBin *bin = GTK_BIN (widget);
+ GtkWidget *child;
widget->allocation = *allocation;
gdk_window_move_resize (widget->window,
allocation->x, allocation->y,
allocation->width, allocation->height);
-
- if (bin->child && gtk_widget_get_visible (bin->child))
+
+ child = gtk_bin_get_child (bin);
+ if (child && gtk_widget_get_visible (child))
{
GtkAllocation child_allocation;
- child_allocation.x = child_allocation.y = GTK_CONTAINER (widget)->border_width;
+ child_allocation.x = gtk_container_get_border_width (GTK_CONTAINER (widget));
+ child_allocation.y = child_allocation.x;
child_allocation.width =
MAX (1, (gint)allocation->width - child_allocation.x * 2);
child_allocation.height =
MAX (1, (gint)allocation->height - child_allocation.y * 2);
- gtk_widget_size_allocate (bin->child, &child_allocation);
+ gtk_widget_size_allocate (child, &child_allocation);
}
}
GtkWin32EmbedWidget *embed_widget = GTK_WIN32_EMBED_WIDGET (widget);
GtkWindow *window = GTK_WINDOW (widget);
GtkContainer *container = GTK_CONTAINER (widget);
- GtkWidget *old_focus_child = container->focus_child;
+ GtkWidget *old_focus_child = gtk_container_get_focus_child (container);
GtkWidget *parent;
+ GtkWidget *child;
/* We override GtkWindow's behavior, since we don't want wrapping here.
*/
else
{
/* Try to focus the first widget in the window */
- if (bin->child && gtk_widget_child_focus (bin->child, direction))
+ child = gtk_bin_get_child (bin);
+ if (child && gtk_widget_child_focus (child, direction))
return TRUE;
}
- if (!GTK_CONTAINER (window)->focus_child)
+ if (!gtk_container_get_focus_child (GTK_CONTAINER (window)))
{
int backwards = FALSE;