diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-04-10 05:56:28 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-04-10 05:56:28 +0000 |
commit | ae52bc80895a23ddbe33b86e75a9cf331ae32ba9 (patch) | |
tree | 5538a7d3541f6d56e4bbab9c6329f5b9db64dafb /x11-toolkits/gtk30/files/patch-gtk_gtkscalebutton.c | |
parent | - Update to 0.6.3 (diff) |
Presenting GNOME 2.26 for FreeBSD. See
http://library.gnome.org/misc/release-notes/2.26/ for a list of what's new.
On the FreeBSD front, we introduced a port of libxul 1.9 as an alternative
for Firefox 2.0 as a Gecko provider. Almost all of the Gecko consumers
can make use of this provider by setting:
WITH_GECKO=libxul
The GNOME 2.26 port was done by ahze, kwm, marcus, and mezz with
contributions by Joseph S. Atkinson, Peter Wemm, Eric L. Chen,
Martin Matuska, Craig Butler, and Pawel Worach.
Notes
Notes:
svn path=/head/; revision=231972
Diffstat (limited to 'x11-toolkits/gtk30/files/patch-gtk_gtkscalebutton.c')
-rw-r--r-- | x11-toolkits/gtk30/files/patch-gtk_gtkscalebutton.c | 133 |
1 files changed, 133 insertions, 0 deletions
diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkscalebutton.c b/x11-toolkits/gtk30/files/patch-gtk_gtkscalebutton.c new file mode 100644 index 000000000000..eb85ae27856e --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-gtk_gtkscalebutton.c @@ -0,0 +1,133 @@ +--- gtk/gtkscalebutton.c 2009/03/06 14:06:46 22478 ++++ gtk/gtkscalebutton.c 2009/03/18 21:19:07 22574 +@@ -119,6 +119,8 @@ + guint prop_id, + GValue *value, + GParamSpec *pspec); ++static void gtk_scale_button_set_orientation_private (GtkScaleButton *button, ++ GtkOrientation orientation); + static gboolean gtk_scale_button_scroll (GtkWidget *widget, + GdkEventScroll *event); + static void gtk_scale_button_screen_changed (GtkWidget *widget, +@@ -434,7 +436,7 @@ + switch (prop_id) + { + case PROP_ORIENTATION: +- gtk_scale_button_set_orientation (button, g_value_get_enum (value)); ++ gtk_scale_button_set_orientation_private (button, g_value_get_enum (value)); + break; + case PROP_VALUE: + gtk_scale_button_set_value (button, g_value_get_double (value)); +@@ -739,54 +741,9 @@ + gtk_scale_button_set_orientation (GtkScaleButton *button, + GtkOrientation orientation) + { +- GtkScaleButtonPrivate *priv; +- + g_return_if_fail (GTK_IS_SCALE_BUTTON (button)); + +- priv = button->priv; +- +- if (orientation != priv->orientation) +- { +- priv->orientation = orientation; +- +- gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), +- orientation); +- gtk_container_child_set (GTK_CONTAINER (priv->box), +- button->plus_button, +- "pack-type", +- orientation == GTK_ORIENTATION_VERTICAL ? +- GTK_PACK_START : GTK_PACK_END, +- NULL); +- gtk_container_child_set (GTK_CONTAINER (priv->box), +- button->minus_button, +- "pack-type", +- orientation == GTK_ORIENTATION_VERTICAL ? +- GTK_PACK_END : GTK_PACK_START, +- NULL); +- +- gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->scale), +- orientation); +- +- if (orientation == GTK_ORIENTATION_VERTICAL) +- { +- gtk_widget_set_size_request (GTK_WIDGET (priv->scale), +- -1, SCALE_SIZE); +- gtk_range_set_inverted (GTK_RANGE (priv->scale), TRUE); +- } +- else +- { +- gtk_widget_set_size_request (GTK_WIDGET (priv->scale), +- SCALE_SIZE, -1); +- gtk_range_set_inverted (GTK_RANGE (priv->scale), FALSE); +- } +- +- /* FIXME: without this, the popup window appears as a square +- * after changing the orientation +- */ +- gtk_window_resize (GTK_WINDOW (priv->dock), 1, 1); +- +- g_object_notify (G_OBJECT (button), "orientation"); +- } ++ gtk_scale_button_set_orientation_private (button, orientation); + } + + /** +@@ -843,6 +800,56 @@ + return button->priv->dock; + } + ++static void ++gtk_scale_button_set_orientation_private (GtkScaleButton *button, ++ GtkOrientation orientation) ++{ ++ GtkScaleButtonPrivate *priv = button->priv; ++ ++ if (orientation != priv->orientation) ++ { ++ priv->orientation = orientation; ++ ++ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->box), ++ orientation); ++ gtk_container_child_set (GTK_CONTAINER (priv->box), ++ button->plus_button, ++ "pack-type", ++ orientation == GTK_ORIENTATION_VERTICAL ? ++ GTK_PACK_START : GTK_PACK_END, ++ NULL); ++ gtk_container_child_set (GTK_CONTAINER (priv->box), ++ button->minus_button, ++ "pack-type", ++ orientation == GTK_ORIENTATION_VERTICAL ? ++ GTK_PACK_END : GTK_PACK_START, ++ NULL); ++ ++ gtk_orientable_set_orientation (GTK_ORIENTABLE (priv->scale), ++ orientation); ++ ++ if (orientation == GTK_ORIENTATION_VERTICAL) ++ { ++ gtk_widget_set_size_request (GTK_WIDGET (priv->scale), ++ -1, SCALE_SIZE); ++ gtk_range_set_inverted (GTK_RANGE (priv->scale), TRUE); ++ } ++ else ++ { ++ gtk_widget_set_size_request (GTK_WIDGET (priv->scale), ++ SCALE_SIZE, -1); ++ gtk_range_set_inverted (GTK_RANGE (priv->scale), FALSE); ++ } ++ ++ /* FIXME: without this, the popup window appears as a square ++ * after changing the orientation ++ */ ++ gtk_window_resize (GTK_WINDOW (priv->dock), 1, 1); ++ ++ g_object_notify (G_OBJECT (button), "orientation"); ++ } ++} ++ + /* + * button callbacks. + */ |