diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2018-09-29 13:18:49 +0200 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2019-07-20 16:42:47 +0200 |
| commit | 986d47dbf57008643d8126e7d71de47f32a15508 (patch) | |
| tree | a2d40a2618a7eaba257a6428f25e1bd01a3aec14 | |
| parent | efca78cc5c8274f0272d51a7d88add5366b5cc52 (diff) | |
band-aid: deprecated-declarations related to gtk
Don't hesitate to revert this one but only if there's a patch to fix it.
Change-Id: Ib15352e1a94d0542120f6710acfe19887494ed51
Reviewed-on: https://gerrit.libreoffice.org/61142
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 618d474f059a75c2ac04df16c830d71a88690118)
| -rw-r--r-- | libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/gtk/gloactiongroup.cxx | 8 |
2 files changed, 15 insertions, 1 deletions
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx index fb5e946c3f77..564c1de137c6 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx @@ -135,9 +135,17 @@ static void initWindow(GtvApplicationWindow* window) { GtvApplicationWindowPrivate* priv = getPrivate(window); +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif GList *focusChain = nullptr; focusChain = g_list_append( focusChain, window->lokdocview ); + gtk_container_set_focus_chain ( GTK_CONTAINER (priv->container), focusChain ); +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif // TODO: Implement progressbar in statusbar LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(LOK_DOC_VIEW(window->lokdocview)); diff --git a/vcl/unx/gtk/gloactiongroup.cxx b/vcl/unx/gtk/gloactiongroup.cxx index fe946f08957f..d8ff5b6a67d3 100644 --- a/vcl/unx/gtk/gloactiongroup.cxx +++ b/vcl/unx/gtk/gloactiongroup.cxx @@ -325,8 +325,14 @@ g_lo_action_group_class_init (GLOActionGroupClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->finalize = g_lo_action_group_finalize; - +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif g_type_class_add_private (klass, sizeof (GLOActionGroupPrivate)); +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif } static void |