callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecate flag macros for toplevel, state, no window and composite child

Browse Source 
Deprecate widget flag macros GTK_WIDGET_STATE, GTK_WIDGET_SAVED_STATE,
GTK_WIDGET_FLAGS, GTK_WIDGET_TOPLEVEL, GTK_WIDGET_NO_WINDOW and
GTK_WIDGET_COMPOSITE_CHILD.

Also deprecate the type macros GTK_WIDGET_TYPE, GTK_OBJECT_TYPE_NAME and
GTK_OBJECT_TYPE which have become redundant.

Instances of GTK_WIDGET_TOPLEVEL are replaced with gtk_widget_is_toplevel,
GTK_WIDGET_TYPE is replaced with G_OBJECT_TYPE, GTK_WIDGET_COMPOSITE_CHILD
is replaced with use of the "composite-child" property and uses of
GTK_WIDGET_NO_WINDOW are adjusted to use gtk_widget_get_has_window.

Uses of GTK_WIDGET_SAVED_STATE and GTK_WIDGET_FLAGS inside GtkWidget are
changed to direct flag usage.

Documentation is updated to refer to gtk_widget_set_has_window and
gtk_widget_get_has_window.

Gail and tests are updated as well.

Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=69872
This commit is contained in:
Christian Dywan
2010-01-04 07:49:26 +01:00
parent ac26960e62
commit bb1824c131
51 changed files with 158 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/other/gail/gailtreeview.c
View File

@ -906,7 +906,7 @@ gail_tree_view_ref_child (AtkObject *obj,
fake_renderer = g_object_new (GTK_TYPE_CELL_RENDERER_TEXT, NULL);
default_registry = atk_get_default_registry ();
factory = atk_registry_get_factory (default_registry,
GTK_OBJECT_TYPE (fake_renderer));
G_OBJECT_TYPE (fake_renderer));
child = atk_object_factory_create_accessible (factory,
G_OBJECT (fake_renderer));
gail_return_val_if_fail (GAIL_IS_RENDERER_CELL (child), NULL);
@ -942,7 +942,7 @@ gail_tree_view_ref_child (AtkObject *obj,
default_registry = atk_get_default_registry ();
factory = atk_registry_get_factory (default_registry,
GTK_OBJECT_TYPE (renderer));
G_OBJECT_TYPE (renderer));
child = atk_object_factory_create_accessible (factory,
G_OBJECT (renderer));
gail_return_val_if_fail (GAIL_IS_RENDERER_CELL (child), NULL);
@ -2200,7 +2200,7 @@ gail_tree_view_grab_cell_focus (GailCellParent *parent,
gtk_tree_path_free (path);
gtk_widget_grab_focus (widget);
toplevel = gtk_widget_get_toplevel (widget);
if (GTK_WIDGET_TOPLEVEL (toplevel))
if (gtk_widget_is_toplevel (toplevel))
{
#ifdef GDK_WINDOWING_X11
gtk_window_present_with_time (GTK_WINDOW (toplevel), gdk_x11_get_server_time (widget->window));

8
modules/other/gail/gailwidget.c
View File

@ -739,7 +739,7 @@ gail_widget_grab_focus (AtkComponent *component)
{
gtk_widget_grab_focus (widget);
toplevel = gtk_widget_get_toplevel (widget);
if (GTK_WIDGET_TOPLEVEL (toplevel))
if (gtk_widget_is_toplevel (toplevel))
{
#ifdef GDK_WINDOWING_X11
gtk_window_present_with_time (GTK_WINDOW (toplevel), gdk_x11_get_server_time (widget->window));
@ -777,7 +777,7 @@ gail_widget_set_extents (AtkComponent *component,
return FALSE;
gail_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
if (GTK_WIDGET_TOPLEVEL (widget))
if (gtk_widget_is_toplevel (widget))
{
if (coord_type == ATK_XY_WINDOW)
{
@ -821,7 +821,7 @@ gail_widget_set_position (AtkComponent *component,
return FALSE;
gail_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
if (GTK_WIDGET_TOPLEVEL (widget))
if (gtk_widget_is_toplevel (widget))
{
if (coord_type == ATK_XY_WINDOW)
{
@ -862,7 +862,7 @@ gail_widget_set_size (AtkComponent *component,
return FALSE;
gail_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
if (GTK_WIDGET_TOPLEVEL (widget))
if (gtk_widget_is_toplevel (widget))
{
gtk_widget_set_size_request (widget, width, height);
return TRUE;

4
modules/other/gail/gailwindow.c
View File

@ -563,7 +563,7 @@ gail_window_get_extents (AtkComponent *component,
gail_return_if_fail (GTK_IS_WINDOW (widget));
if (!GTK_WIDGET_TOPLEVEL (widget))
if (!gtk_widget_is_toplevel (widget))
{
AtkComponentIface *parent_iface;
@ -608,7 +608,7 @@ gail_window_get_size (AtkComponent *component,
gail_return_if_fail (GTK_IS_WINDOW (widget));
if (!GTK_WIDGET_TOPLEVEL (widget))
if (!gtk_widget_is_toplevel (widget))
{
AtkComponentIface *parent_iface;

2
modules/other/gail/tests/testaction.c
View File

@ -22,7 +22,7 @@ _check_object (AtkObject *obj)
GtkWidget* widget = NULL;
widget = GTK_ACCESSIBLE (obj)->widget;
typename = g_type_name (GTK_OBJECT_TYPE (widget));
typename = g_type_name (G_OBJECT_TYPE (widget));
g_print ("Widget type name: %s\n", typename ? typename : "NULL");
}
typename = g_type_name (G_OBJECT_TYPE (obj));

2
modules/other/gail/tests/testnotebook.c
View File

@ -24,7 +24,7 @@ static void _print_type (AtkObject *obj)
GtkWidget* widget = NULL;
widget = GTK_ACCESSIBLE (obj)->widget;
typename = g_type_name (GTK_OBJECT_TYPE (widget));
typename = g_type_name (G_OBJECT_TYPE (widget));
g_print ("\tWidget type name: %s\n", typename ? typename : "NULL");
}

2
modules/other/gail/tests/testobject.c
View File

@ -54,7 +54,7 @@ static void _print_type (AtkObject *obj)
GtkWidget* widget = NULL;
widget = GTK_ACCESSIBLE (obj)->widget;
typename = g_type_name (GTK_OBJECT_TYPE (widget));
typename = g_type_name (G_OBJECT_TYPE (widget));
g_print ("Widget type name: %s\n", typename ? typename : "NULL");
}
typename = g_type_name (G_OBJECT_TYPE (obj));

2
modules/other/gail/tests/testselection.c
View File

@ -58,7 +58,7 @@ static void _print_type (AtkObject *obj)
GtkWidget* widget = NULL;
widget = GTK_ACCESSIBLE (obj)->widget;
typename = g_type_name (GTK_OBJECT_TYPE (widget));
typename = g_type_name (G_OBJECT_TYPE (widget));
g_print ("Widget type name: %s\n", typename ? typename : "NULL");
}
typename = g_type_name (G_OBJECT_TYPE (obj));