[Libreoffice-commits] core.git: vcl/unx
Caolán McNamara
caolanm at redhat.com
Mon Oct 17 20:45:28 UTC 2016
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit b5f9fdff49e6955550cffa5318bee9d5c09f3479
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 17 21:43:58 2016 +0100
Resolves: tdf#89760 get correct menubar text color for 'close preview'
Change-Id: Ife6f2665eabeefd6125a53318404dbd7b9af42ee
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 336b12a..2b3f191 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -1259,10 +1259,10 @@ GtkStyleContext* GtkSalGraphics::createNewContext(GtkControlPart ePart, gtk_widg
}
case GtkControlPart::MenuBar:
{
- GtkWidgetPath *path = gtk_widget_path_new();
+ GtkWidgetPath *path = gtk_widget_path_copy(gtk_style_context_get_path(mpWindowStyle));
gtk_widget_path_append_type(path, GTK_TYPE_MENU_BAR);
set_object_name(path, -1, "menubar");
- return makeContext(path, nullptr);
+ return makeContext(path, mpWindowStyle);
}
case GtkControlPart::MenuBarItem:
{
@@ -1600,10 +1600,10 @@ GtkStyleContext* GtkSalGraphics::createOldContext(GtkControlPart ePart)
}
case GtkControlPart::MenuBar:
{
- GtkWidgetPath *path = gtk_widget_path_new();
+ GtkWidgetPath *path = gtk_widget_path_copy(gtk_style_context_get_path(mpWindowStyle));
gtk_widget_path_append_type(path, GTK_TYPE_MENU_BAR);
gtk_widget_path_iter_add_class(path, -1, GTK_STYLE_CLASS_MENUBAR);
- return makeContext(path, nullptr);
+ return makeContext(path, mpWindowStyle);
}
case GtkControlPart::MenuBarItem:
{
More information about the Libreoffice-commits
mailing list