[arch-commits] Commit in gtk-smooth-engine/trunk (2 files)
Daniel Griffiths
dgriffiths at archlinux.org
Thu May 20 20:56:51 UTC 2010
Date: Thursday, May 20, 2010 @ 16:56:50
Author: dgriffiths
Revision: 80710
added patches
Added:
gtk-smooth-engine/trunk/deprecated_macros.patch
gtk-smooth-engine/trunk/free_border.patch
-------------------------+
deprecated_macros.patch | 100 ++++++++++++++++++++++++++++++++++++++++++++++
free_border.patch | 21 +++++++++
2 files changed, 121 insertions(+)
Added: deprecated_macros.patch
===================================================================
--- deprecated_macros.patch (rev 0)
+++ deprecated_macros.patch 2010-05-20 20:56:50 UTC (rev 80710)
@@ -0,0 +1,100 @@
+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
+--- gtk-smooth-engine-0.6.0.1.orig/engines/gtk2/src/smooth_gtk2_drawing.c 2005-01-17 15:03:40.000000000 -0500
++++ gtk-smooth-engine-0.6.0.1/engines/gtk2/src/smooth_gtk2_drawing.c 2010-04-15 13:36:48.000000000 -0400
+@@ -489,7 +489,7 @@
+
+ g_object_set_data(G_OBJECT(get_combo_box_widget_parent(widget)), "button", widget);
+
+- if (GTK_WIDGET_HAS_FOCUS(widget))
++ if (gtk_widget_has_focus(widget))
+ {
+ gtk_widget_get_focus_props (widget, &focus_line_width, &focus_padding, &interior_focus);
+ if (!interior_focus)
+@@ -503,7 +503,7 @@
+
+ for (child = children; child; child = child->next)
+ {
+- if (GTK_IS_ENTRY(child->data) && GTK_WIDGET_HAS_FOCUS(child->data))
++ if (GTK_IS_ENTRY(child->data) && gtk_widget_has_focus(child->data))
+ {
+ gtk_widget_get_focus_props (GTK_WIDGET(child->data), &focus_line_width, &focus_padding, &interior_focus);
+
+@@ -611,7 +611,7 @@
+ width + thick*2 + focus_padding*2, height - focus*2 + focus_padding*2);
+ }
+
+- if (GTK_WIDGET_HAS_FOCUS(widget) && (!interior_focus))
++ if (gtk_widget_has_focus(widget) && (!interior_focus))
+ {
+ focus = -focus_padding;
+ }
+@@ -715,7 +715,7 @@
+ width + thick*2 - focus + focus_padding*2, height - focus*2 + focus_padding*2);
+ }
+
+- if (GTK_WIDGET_HAS_FOCUS(widget) && (!interior_focus))
++ if (gtk_widget_has_focus(widget) && (!interior_focus))
+ {
+ focus = -focus_padding;
+ }
+@@ -757,7 +757,7 @@
+ * more complicated because we can only do half for each stepper.
+ */
+
+- GtkStateType parent_state = GTK_WIDGET_STATE(widget);
++ GtkStateType parent_state = gtk_widget_get_state(widget);
+ SmoothRectangle spin_area;
+ smooth_part_style *part = NULL;
+ SmoothInt thick = 2;
+@@ -781,7 +781,7 @@
+ else if (EDGE_LINE_STYLE(style, part) == SMOOTH_BEVEL_STYLE_ICED)
+ thick = 1;
+
+- if (GTK_WIDGET_HAS_FOCUS(widget))
++ if (gtk_widget_has_focus(widget))
+ {
+ gtk_widget_get_focus_props (widget, &focus_line_width, &focus_padding, &interior_focus);
+ if (!interior_focus)
+@@ -1084,7 +1084,7 @@
+ /* per widget special drawing */
+ if (CHECK_DETAIL(detail, "slider") || CHECK_DETAIL(detail, "smooth_slider"))
+ smooth_draw_slider_grip(Canvas, style, state_type, X, Y, Width, Height, Horizontal);
+- else if (CHECK_DETAIL(detail, "button") && (smooth_button_default_triangle(style)) & GTK_WIDGET_HAS_DEFAULT (widget))
++ else if (CHECK_DETAIL(detail, "button") && (smooth_button_default_triangle(style)) & gtk_widget_has_default (widget))
+ {
+ /* Paint a triangle here instead of in "buttondefault"
+ * which is drawn _behind_ the current button
+@@ -1710,7 +1710,7 @@
+
+ /* Paint a triangle here instead of in "buttondefault"
+ which is drawn _behind_ the current button */
+- if (GTK_WIDGET_HAS_DEFAULT (widget)) {
++ if (gtk_widget_has_default (widget)) {
+ gdk_draw_polygon(window, style->dark_gc[state_type], FALSE, points1, 3);
+ gdk_draw_polygon(window, style->light_gc[state_type], FALSE, points2, 3);
+ gdk_draw_polygon(window, style->bg_gc[GTK_STATE_SELECTED], TRUE, points2, 3);
+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
+--- gtk-smooth-engine-0.6.0.1.orig/engines/gtk2/src/smooth_gtk2_misc.c 2005-01-17 15:03:40.000000000 -0500
++++ gtk-smooth-engine-0.6.0.1/engines/gtk2/src/smooth_gtk2_misc.c 2010-04-15 13:34:15.000000000 -0400
+@@ -269,10 +269,10 @@
+ {
+ g_return_val_if_fail(GTK_IS_WIDGET(widget), NULL);
+
+- while (widget && widget->parent && !g_type_is_a(GTK_WIDGET_TYPE(widget->parent), GTK_TYPE_NOTEBOOK))
++ while (widget && widget->parent && !g_type_is_a(G_OBJECT_TYPE(widget->parent), GTK_TYPE_NOTEBOOK))
+ widget = widget->parent;
+
+- if (!(widget && widget->parent && g_type_is_a(GTK_WIDGET_TYPE(widget->parent), GTK_TYPE_NOTEBOOK)))
++ if (!(widget && widget->parent && g_type_is_a(G_OBJECT_TYPE(widget->parent), GTK_TYPE_NOTEBOOK)))
+ return NULL;
+
+
+@@ -580,7 +580,7 @@
+ {
+ gboolean result = TRUE;
+
+- while ((widget) && (!GTK_WIDGET_TOPLEVEL(widget)))
++ while ((widget) && (!gtk_widget_is_toplevel(widget)))
+ widget = widget->parent;
+
+ if ((widget) && GTK_IS_WINDOW(widget) && (gtk_window_get_decorated(GTK_WINDOW(widget))))
Added: free_border.patch
===================================================================
--- free_border.patch (rev 0)
+++ free_border.patch 2010-05-20 20:56:50 UTC (rev 80710)
@@ -0,0 +1,21 @@
+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
+--- gtk-smooth-engine-0.6.0.1.orig/engines/gtk2/src/smooth_gtk2_misc.c 2005-01-17 15:03:40.000000000 -0500
++++ gtk-smooth-engine-0.6.0.1/engines/gtk2/src/smooth_gtk2_misc.c 2010-04-15 15:36:22.000000000 -0400
+@@ -526,7 +526,7 @@
+ if (tmp_border)
+ {
+ *default_border = *tmp_border;
+- g_free (tmp_border);
++ gtk_border_free (tmp_border);
+ }
+ else
+ *default_border = default_default_border;
+@@ -539,7 +539,7 @@
+ if (tmp_border)
+ {
+ *default_outside_border = *tmp_border;
+- g_free (tmp_border);
++ gtk_border_free (tmp_border);
+ }
+ else
+ *default_outside_border = default_default_outside_border;
More information about the arch-commits
mailing list