Reset gail library versioning to 0.0.0, since we changed soname

[~andy/gtk] / gtk / gtkiconview.c

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 15fdb6ff3e0490f4462eee78f8f88187a9aa7d76..ebb63a12b0e2b542df9a158e944db11f04106e78 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -1106,7 +1106,7 @@ gtk_icon_view_init (GtkIconView *icon_view)
   icon_view->priv->pixbuf_cell = -1;  
   icon_view->priv->tooltip_column = -1;  
 
-  GTK_WIDGET_SET_FLAGS (icon_view, GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus (GTK_WIDGET (icon_view), TRUE);
   
   gtk_icon_view_set_adjustments (icon_view, NULL, NULL);
 
@@ -1318,7 +1318,7 @@ gtk_icon_view_realize (GtkWidget *widget)
   
   icon_view = GTK_ICON_VIEW (widget);
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  gtk_widget_set_realized (widget, TRUE);
 
   /* Make the main, clipping window */
   attributes.window_type = GDK_WINDOW_CHILD;
@@ -1382,7 +1382,7 @@ gtk_icon_view_state_changed (GtkWidget      *widget,
 {
   GtkIconView *icon_view = GTK_ICON_VIEW (widget);
 
-  if (GTK_WIDGET_REALIZED (widget))
+  if (gtk_widget_get_realized (widget))
     {
       gdk_window_set_background (widget->window, &widget->style->base[widget->state]);
       gdk_window_set_background (icon_view->priv->bin_window, &widget->style->base[widget->state]);
@@ -1397,7 +1397,7 @@ gtk_icon_view_style_set (GtkWidget *widget,
 {
   GtkIconView *icon_view = GTK_ICON_VIEW (widget);
 
-  if (GTK_WIDGET_REALIZED (widget))
+  if (gtk_widget_get_realized (widget))
     {
       gdk_window_set_background (widget->window, &widget->style->base[widget->state]);
       gdk_window_set_background (icon_view->priv->bin_window, &widget->style->base[widget->state]);
@@ -1472,7 +1472,7 @@ gtk_icon_view_size_allocate (GtkWidget      *widget,
 
   widget->allocation = *allocation;
   
-  if (GTK_WIDGET_REALIZED (widget))
+  if (gtk_widget_get_realized (widget))
     {
       gdk_window_move_resize (widget->window,
                              allocation->x, allocation->y,
@@ -1507,7 +1507,7 @@ gtk_icon_view_size_allocate (GtkWidget      *widget,
   if (vadjustment->value > vadjustment->upper - vadjustment->page_size)
     gtk_adjustment_set_value (vadjustment, MAX (0, vadjustment->upper - vadjustment->page_size));
 
-  if (GTK_WIDGET_REALIZED (widget) &&
+  if (gtk_widget_get_realized (widget) &&
       icon_view->priv->scroll_to_path)
     {
       GtkTreePath *path;
@@ -1592,7 +1592,7 @@ gtk_icon_view_expose (GtkWidget *widget,
        case GTK_ICON_VIEW_DROP_INTO:
          gtk_paint_focus (widget->style,
                           icon_view->priv->bin_window,
-                          GTK_WIDGET_STATE (widget),
+                          gtk_widget_get_state (widget),
                           NULL,
                           widget,
                           "iconview-drop-indicator",
@@ -1602,7 +1602,7 @@ gtk_icon_view_expose (GtkWidget *widget,
        case GTK_ICON_VIEW_DROP_ABOVE:
          gtk_paint_focus (widget->style,
                           icon_view->priv->bin_window,
-                          GTK_WIDGET_STATE (widget),
+                          gtk_widget_get_state (widget),
                           NULL,
                           widget,
                           "iconview-drop-indicator",
@@ -1612,7 +1612,7 @@ gtk_icon_view_expose (GtkWidget *widget,
        case GTK_ICON_VIEW_DROP_LEFT:
          gtk_paint_focus (widget->style,
                           icon_view->priv->bin_window,
-                          GTK_WIDGET_STATE (widget),
+                          gtk_widget_get_state (widget),
                           NULL,
                           widget,
                           "iconview-drop-indicator",
@@ -1622,7 +1622,7 @@ gtk_icon_view_expose (GtkWidget *widget,
        case GTK_ICON_VIEW_DROP_BELOW:
          gtk_paint_focus (widget->style,
                           icon_view->priv->bin_window,
-                          GTK_WIDGET_STATE (widget),
+                          gtk_widget_get_state (widget),
                           NULL,
                           widget,
                           "iconview-drop-indicator",
@@ -1632,7 +1632,7 @@ gtk_icon_view_expose (GtkWidget *widget,
        case GTK_ICON_VIEW_DROP_RIGHT:
          gtk_paint_focus (widget->style,
                           icon_view->priv->bin_window,
-                          GTK_WIDGET_STATE (widget),
+                          gtk_widget_get_state (widget),
                           NULL,
                           widget,
                           "iconview-drop-indicator",
@@ -1849,7 +1849,7 @@ gtk_icon_view_put (GtkIconView     *icon_view,
 
   icon_view->priv->children = g_list_append (icon_view->priv->children, child);
 
-  if (GTK_WIDGET_REALIZED (icon_view))
+  if (gtk_widget_get_realized (GTK_WIDGET (icon_view)))
     gtk_widget_set_parent_window (child->widget, icon_view->priv->bin_window);
   
   gtk_widget_set_parent (widget, GTK_WIDGET (icon_view));
@@ -2652,7 +2652,7 @@ static void
 gtk_icon_view_adjustment_changed (GtkAdjustment *adjustment,
                                  GtkIconView   *icon_view)
 {
-  if (GTK_WIDGET_REALIZED (icon_view))
+  if (gtk_widget_get_realized (GTK_WIDGET (icon_view)))
     {
       gdk_window_move (icon_view->priv->bin_window,
                       - icon_view->priv->hadjustment->value,
@@ -2854,7 +2854,7 @@ gtk_icon_view_layout (GtkIconView *icon_view)
       icon_view->priv->height != widget->requisition.height)
     gtk_widget_queue_resize_no_redraw (widget);
 
-  if (GTK_WIDGET_REALIZED (icon_view))
+  if (gtk_widget_get_realized (GTK_WIDGET (icon_view)))
     gdk_window_resize (icon_view->priv->bin_window,
                       MAX (icon_view->priv->width, widget->allocation.width),
                       MAX (icon_view->priv->height, widget->allocation.height));
@@ -4358,7 +4358,8 @@ gtk_icon_view_scroll_to_path (GtkIconView *icon_view,
     item = g_list_nth_data (icon_view->priv->items,
                            gtk_tree_path_get_indices(path)[0]);
   
-  if (!GTK_WIDGET_REALIZED (icon_view) || !item || item->width < 0)
+  if (!item || item->width < 0 ||
+      !gtk_widget_get_realized (GTK_WIDGET (icon_view)))
     {
       if (icon_view->priv->scroll_to_path)
        gtk_tree_row_reference_free (icon_view->priv->scroll_to_path);
@@ -5381,7 +5382,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view,
 
   g_object_notify (G_OBJECT (icon_view), "model");  
 
-  if (GTK_WIDGET_REALIZED (icon_view))
+  if (gtk_widget_get_realized (GTK_WIDGET (icon_view)))
     gtk_widget_queue_resize (GTK_WIDGET (icon_view));
 }
 
@@ -7376,7 +7377,7 @@ gtk_icon_view_create_drag_icon (GtkIconView *icon_view,
 
   widget = GTK_WIDGET (icon_view);
 
-  if (!GTK_WIDGET_REALIZED (widget))
+  if (!gtk_widget_get_realized (widget))
     return NULL;
 
   index = gtk_tree_path_get_indices (path)[0];
@@ -7396,7 +7397,7 @@ gtk_icon_view_create_drag_icon (GtkIconView *icon_view,
          cairo_set_line_width (cr, 1.);
 
          gdk_cairo_set_source_color
-           (cr, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+           (cr, &widget->style->base[gtk_widget_get_state (widget)]);
          cairo_rectangle (cr, 0, 0, item->width + 2, item->height + 2);
          cairo_fill (cr);