diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-08-08 15:21:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-08-08 20:30:07 +0200 |
| commit | d632b83a4b4998930112218081db4d619713583b (patch) | |
| tree | e8427b13f9095dfce2c77a3a4c83328f6e61223e /vcl/unx/gtk3 | |
| parent | 479cf04cee6f360c9bca618369b6b545b94e55ef (diff) | |
gtk4: complete set_cursor for gtk4
Change-Id: I31413a6dafe1ddf1345ac6bccb96fc88ed2993c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137985
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx/gtk3')
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
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) |