libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
New commits: commit db518e432368f98ed24bdad48beac370475b67b1 Author: Mike Kaganski <[email protected]> AuthorDate: Mon Oct 24 18:13:02 2022 +0200 Commit: Mike Kaganski <[email protected]> CommitDate: Tue Oct 25 08:30:43 2022 +0200 _MSC_VER is more appropriate to guard MSVC-specific #pragma Thanks to sberg for noticing this Change-Id: I37a3031cbfa3f8a0751bab126bd742dcec36664f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141743 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> (cherry picked from commit 56b5046e03d2db684fe35239acfea553ff7d9b7f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141747 Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx index 32ad84ac116a..ef2f26917b30 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx @@ -151,7 +151,7 @@ static void initWindow(GtvApplicationWindow* window) #if defined __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#elif defined _WIN32 +#elif defined _MSC_VER #pragma warning(push) #pragma warning(disable:4996) #endif @@ -161,7 +161,7 @@ static void initWindow(GtvApplicationWindow* window) gtk_container_set_focus_chain ( GTK_CONTAINER (priv->container), focusChain ); #if defined __GNUC__ #pragma GCC diagnostic pop -#elif defined _WIN32 +#elif defined _MSC_VER #pragma warning(pop) #endif commit f2da312c1aebb8f9645a6c1fa458cb6ed89a797f Author: Mike Kaganski <[email protected]> AuthorDate: Mon Oct 24 13:52:27 2022 +0200 Commit: Mike Kaganski <[email protected]> CommitDate: Tue Oct 25 08:30:30 2022 +0200 Avoid "deprecated" warning on Windows, too Change-Id: I199adcb3e8b7fabc625b3ac1735326934cc84088 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141739 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> (cherry picked from commit 60b9008d20641b4e454431c148fa8d77c98a75c8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141742 Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx index 7e2f9f907ebf..32ad84ac116a 100644 --- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx @@ -148,16 +148,21 @@ static void initWindow(GtvApplicationWindow* window) { GtvApplicationWindowPrivate* priv = getPrivate(window); -#ifdef __GNUC__ +#if defined __GNUC__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#elif defined _WIN32 +#pragma warning(push) +#pragma warning(disable:4996) #endif GList *focusChain = nullptr; focusChain = g_list_append( focusChain, window->lokdocview ); gtk_container_set_focus_chain ( GTK_CONTAINER (priv->container), focusChain ); -#ifdef __GNUC__ +#if defined __GNUC__ #pragma GCC diagnostic pop +#elif defined _WIN32 +#pragma warning(pop) #endif // TODO: Implement progressbar in statusbar
