gtk2-smooth-engine/deprecated_macros.diff

   1 diff -ru gtk-smooth-engine-0.6.0.1.orig/engines/gtk2/src/smooth_gtk2_drawing.c gtk-smooth-engine-0.6.0.1/engines/gtk2/src/smooth_gtk2_drawing.c
   2 --- gtk-smooth-engine-0.6.0.1.orig/engines/gtk2/src/smooth_gtk2_drawing.c       2005-01-17 15:03:40.000000000 -0500
   3 +++ gtk-smooth-engine-0.6.0.1/engines/gtk2/src/smooth_gtk2_drawing.c    2010-04-15 13:36:48.000000000 -0400
   4 @@ -489,7 +489,7 @@
   5
   6    g_object_set_data(G_OBJECT(get_combo_box_widget_parent(widget)), "button", widget);
   7
   8 -       if (GTK_WIDGET_HAS_FOCUS(widget))
   9 +       if (gtk_widget_has_focus(widget))
  10         {
  11                 gtk_widget_get_focus_props (widget, &focus_line_width, &focus_padding, &interior_focus);
  12                 if (!interior_focus)
  13 @@ -503,7 +503,7 @@
  14
  15                 for (child = children; child; child = child->next)
  16                 {
  17 -                       if (GTK_IS_ENTRY(child->data) && GTK_WIDGET_HAS_FOCUS(child->data))
  18 +                       if (GTK_IS_ENTRY(child->data) && gtk_widget_has_focus(child->data))
  19                         {
  20                                 gtk_widget_get_focus_props (GTK_WIDGET(child->data), &focus_line_width, &focus_padding, &interior_focus);
  21
  22 @@ -611,7 +611,7 @@
  23                                 width + thick*2 + focus_padding*2, height - focus*2 + focus_padding*2);
  24          }
  25
  26 -      if (GTK_WIDGET_HAS_FOCUS(widget) && (!interior_focus))
  27 +      if (gtk_widget_has_focus(widget) && (!interior_focus))
  28        {
  29          focus = -focus_padding;
  30        }
  31 @@ -715,7 +715,7 @@
  32                                  width + thick*2 - focus + focus_padding*2, height - focus*2 + focus_padding*2);
  33          }
  34
  35 -      if (GTK_WIDGET_HAS_FOCUS(widget) && (!interior_focus))
  36 +      if (gtk_widget_has_focus(widget) && (!interior_focus))
  37        {
  38          focus = -focus_padding;
  39        }
  40 @@ -757,7 +757,7 @@
  41     * more complicated because we can only do half for each stepper.
  42     */
  43
  44 -  GtkStateType parent_state = GTK_WIDGET_STATE(widget);
  45 +  GtkStateType parent_state = gtk_widget_get_state(widget);
  46    SmoothRectangle spin_area;
  47    smooth_part_style *part = NULL;
  48    SmoothInt thick = 2;
  49 @@ -781,7 +781,7 @@
  50    else if (EDGE_LINE_STYLE(style, part) == SMOOTH_BEVEL_STYLE_ICED)
  51      thick = 1;
  52
  53 -       if (GTK_WIDGET_HAS_FOCUS(widget))
  54 +       if (gtk_widget_has_focus(widget))
  55         {
  56                 gtk_widget_get_focus_props (widget, &focus_line_width, &focus_padding, &interior_focus);
  57                 if (!interior_focus)
  58 @@ -1084,7 +1084,7 @@
  59          /* per widget special drawing */
  60          if (CHECK_DETAIL(detail, "slider") || CHECK_DETAIL(detail, "smooth_slider"))
  61            smooth_draw_slider_grip(Canvas, style, state_type, X, Y, Width, Height, Horizontal);
  62 -        else if (CHECK_DETAIL(detail, "button") && (smooth_button_default_triangle(style)) & GTK_WIDGET_HAS_DEFAULT (widget))
  63 +        else if (CHECK_DETAIL(detail, "button") && (smooth_button_default_triangle(style)) & gtk_widget_has_default (widget))
  64         {
  65                 /* Paint a triangle here instead of in "buttondefault"
  66                  * which is drawn _behind_ the current button
  67 @@ -1710,7 +1710,7 @@
  68
  69     /* Paint a triangle here instead of in "buttondefault"
  70        which is drawn _behind_ the current button */
  71 -   if (GTK_WIDGET_HAS_DEFAULT (widget)) {
  72 +   if (gtk_widget_has_default (widget)) {
  73       gdk_draw_polygon(window, style->dark_gc[state_type], FALSE, points1, 3);
  74       gdk_draw_polygon(window, style->light_gc[state_type], FALSE, points2, 3);
  75       gdk_draw_polygon(window, style->bg_gc[GTK_STATE_SELECTED], TRUE, points2, 3);
  76 diff -ru gtk-smooth-engine-0.6.0.1.orig/engines/gtk2/src/smooth_gtk2_misc.c gtk-smooth-engine-0.6.0.1/engines/gtk2/src/smooth_gtk2_misc.c
  77 --- gtk-smooth-engine-0.6.0.1.orig/engines/gtk2/src/smooth_gtk2_misc.c  2005-01-17 15:03:40.000000000 -0500
  78 +++ gtk-smooth-engine-0.6.0.1/engines/gtk2/src/smooth_gtk2_misc.c       2010-04-15 13:34:15.000000000 -0400
  79 @@ -269,10 +269,10 @@
  80  {
  81    g_return_val_if_fail(GTK_IS_WIDGET(widget), NULL);
  82
  83 -  while (widget && widget->parent && !g_type_is_a(GTK_WIDGET_TYPE(widget->parent), GTK_TYPE_NOTEBOOK))
  84 +  while (widget && widget->parent && !g_type_is_a(G_OBJECT_TYPE(widget->parent), GTK_TYPE_NOTEBOOK))
  85      widget = widget->parent;
  86
  87 -  if (!(widget && widget->parent && g_type_is_a(GTK_WIDGET_TYPE(widget->parent), GTK_TYPE_NOTEBOOK)))
  88 +  if (!(widget && widget->parent && g_type_is_a(G_OBJECT_TYPE(widget->parent), GTK_TYPE_NOTEBOOK)))
  89      return NULL;
  90
  91
  92 @@ -580,7 +580,7 @@
  93  {
  94         gboolean result = TRUE;
  95
  96 -       while ((widget) && (!GTK_WIDGET_TOPLEVEL(widget)))
  97 +       while ((widget) && (!gtk_widget_is_toplevel(widget)))
  98                 widget = widget->parent;
  99
 100         if ((widget) && GTK_IS_WINDOW(widget) && (gtk_window_get_decorated(GTK_WINDOW(widget))))