Kaydet (Commit) 6d0a0bf5 authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Miklos Vajna

gtk3: rework to remove gtk_style_context_set_path warning

Change-Id: I5d09d460e145bc3dc04d0cdd27bc4a1094053669
(cherry picked from commit e7a6b023)
Reviewed-on: https://gerrit.libreoffice.org/16846Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 1b232a56
...@@ -1971,8 +1971,6 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow ) ...@@ -1971,8 +1971,6 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow )
if(style_loaded) if(style_loaded)
return; return;
GtkWidgetPath* path;
style_loaded = true; style_loaded = true;
gtk_init(NULL, NULL); gtk_init(NULL, NULL);
/* Load the GtkStyleContexts, it might be a bit slow, but usually, /* Load the GtkStyleContexts, it might be a bit slow, but usually,
...@@ -1989,24 +1987,19 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow ) ...@@ -1989,24 +1987,19 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow )
getStyleContext(&mpTextViewStyle, gtk_text_view_new()); getStyleContext(&mpTextViewStyle, gtk_text_view_new());
getStyleContext(&mpButtonStyle, gtk_button_new()); getStyleContext(&mpButtonStyle, gtk_button_new());
getStyleContext(&mpToolbarStyle, gtk_toolbar_new()); GtkWidget* pToolbar = gtk_toolbar_new();
mpToolbarStyle = gtk_widget_get_style_context(pToolbar);
gtk_style_context_add_class(mpToolbarStyle, GTK_STYLE_CLASS_PRIMARY_TOOLBAR); gtk_style_context_add_class(mpToolbarStyle, GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
gtk_style_context_add_class(mpToolbarStyle, GTK_STYLE_CLASS_TOOLBAR); gtk_style_context_add_class(mpToolbarStyle, GTK_STYLE_CLASS_TOOLBAR);
getStyleContext(&mpToolbarSeperatorStyle, GTK_WIDGET(gtk_separator_tool_item_new())); GtkToolItem *item = gtk_separator_tool_item_new();
gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), item, -1);
getStyleContext(&mpToolButtonStyle, gtk_button_new()); mpToolbarSeperatorStyle = gtk_widget_get_style_context(GTK_WIDGET(item));
/* Create a widget path for our toolbutton widget */ GtkWidget *pButton = gtk_button_new();
path = gtk_widget_path_new(); item = gtk_tool_button_new(pButton, NULL);
gtk_widget_path_append_type(path, GTK_TYPE_TOOLBAR); gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), item, -1);
gtk_widget_path_append_type(path, GTK_TYPE_TOOL_BUTTON); mpToolButtonStyle = gtk_widget_get_style_context(GTK_WIDGET(pButton));
gtk_widget_path_append_type(path, GTK_TYPE_BUTTON);
gtk_widget_path_iter_add_class (path, 0, GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
gtk_widget_path_iter_add_class (path, 1, GTK_STYLE_CLASS_TOOLBAR);
gtk_widget_path_iter_add_class (path, 2, GTK_STYLE_CLASS_BUTTON);
gtk_style_context_set_path(mpToolButtonStyle, path);
gtk_widget_path_free (path);
getStyleContext(&mpVScrollbarStyle, gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL)); getStyleContext(&mpVScrollbarStyle, gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL));
gtk_style_context_add_class(mpVScrollbarStyle, GTK_STYLE_CLASS_SCROLLBAR); gtk_style_context_add_class(mpVScrollbarStyle, GTK_STYLE_CLASS_SCROLLBAR);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment