[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit d632b83a4b4998930112218081db4d619713583b
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Aug 8 15:21:14 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Aug 8 20:30:07 2022 +0200

    gtk4: complete set_cursor for gtk4
    
    Change-Id: I31413a6dafe1ddf1345ac6bccb96fc88ed2993c2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137985
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index cd26d1f5c3b3..0576c8ac84c2 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -2495,19 +2495,18 @@ void LocalizeDecimalSeparator(guint& keyval)
 
 void set_cursor(GtkWidget* pWidget, const char *pName)
 {
-#if !GTK_CHECK_VERSION(4, 0, 0)
     if (!gtk_widget_get_realized(pWidget))
         gtk_widget_realize(pWidget);
     GdkDisplay *pDisplay = gtk_widget_get_display(pWidget);
+#if GTK_CHECK_VERSION(4, 0, 0)
+    GdkCursor *pCursor = pName ? gdk_cursor_new_from_name(pName, nullptr) : 
nullptr;
+#else
     GdkCursor *pCursor = pName ? gdk_cursor_new_from_name(pDisplay, pName) : 
nullptr;
+#endif
     widget_set_cursor(pWidget, pCursor);
     gdk_display_flush(pDisplay);
     if (pCursor)
         g_object_unref(pCursor);
-#else
-    (void)pWidget;
-    (void)pName;
-#endif
 }
 
 vcl::Font get_font(GtkWidget* pWidget)