diff options
| author | David Bolen <db3l.net@gmail.com> | 2012-03-20 12:46:21 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-03-20 12:49:04 +0100 |
| commit | fd205e95ad1bc1dca319900311b47e589e06e9f1 (patch) | |
| tree | 555170bb580fde0c33f10b2663559333115c4d4d /vcl/unx/gtk/gdi | |
| parent | 3a878d3dbfdb11cf2f0cce9dbf28a408c130d556 (diff) | |
Missing sub-menu arrows with 3.5.x and GTK < 2.15
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'vcl/unx/gtk/gdi')
| -rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 6669a9717ddb..0b723e1c099d 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -1027,13 +1027,21 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, gint arrow_size; gint arrow_extent; guint horizontal_padding; - gfloat arrow_scaling; + gfloat arrow_scaling = 0.4; // Default for early GTK versions gtk_widget_style_get( widget, "horizontal-padding", &horizontal_padding, - "arrow-scaling", &arrow_scaling, NULL ); + // Use arrow-scaling property if available (2.15+), avoid warning otherwise + if ( gtk_widget_class_find_style_property( GTK_WIDGET_GET_CLASS( widget ), + "arrow-scaling" ) ) + { + gtk_widget_style_get( widget, + "arrow-scaling", &arrow_scaling, + NULL ); + } + child = GTK_BIN( widget )->child; context = gtk_widget_get_pango_context( child ); |