diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-08 09:11:03 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-09 07:37:48 +0000 |
| commit | 6d0a0bf56539ee95d30f3b65dafbdd94a6b1b936 (patch) | |
| tree | 25c119f4d76ccdd2889498ea78d31075b84b1ac8 /vcl | |
| parent | 1b232a5624a8cb273bfb13e1b483724b96c9bc63 (diff) | |
gtk3: rework to remove gtk_style_context_set_path warning
Change-Id: I5d09d460e145bc3dc04d0cdd27bc4a1094053669
(cherry picked from commit e7a6b023e3354713ec584321e849e575ab310cb9)
Reviewed-on: https://gerrit.libreoffice.org/16846
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index ac99078cb547..be50e5af0757 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -1971,8 +1971,6 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow ) if(style_loaded) return; - GtkWidgetPath* path; - style_loaded = true; gtk_init(NULL, NULL); /* Load the GtkStyleContexts, it might be a bit slow, but usually, @@ -1989,24 +1987,19 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow ) getStyleContext(&mpTextViewStyle, gtk_text_view_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_TOOLBAR); - getStyleContext(&mpToolbarSeperatorStyle, GTK_WIDGET(gtk_separator_tool_item_new())); - - getStyleContext(&mpToolButtonStyle, gtk_button_new()); + GtkToolItem *item = gtk_separator_tool_item_new(); + gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), item, -1); + mpToolbarSeperatorStyle = gtk_widget_get_style_context(GTK_WIDGET(item)); - /* Create a widget path for our toolbutton widget */ - path = gtk_widget_path_new(); - gtk_widget_path_append_type(path, GTK_TYPE_TOOLBAR); - gtk_widget_path_append_type(path, GTK_TYPE_TOOL_BUTTON); - 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); + GtkWidget *pButton = gtk_button_new(); + item = gtk_tool_button_new(pButton, NULL); + gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), item, -1); + mpToolButtonStyle = gtk_widget_get_style_context(GTK_WIDGET(pButton)); getStyleContext(&mpVScrollbarStyle, gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL)); gtk_style_context_add_class(mpVScrollbarStyle, GTK_STYLE_CLASS_SCROLLBAR); |