vcl/unx/gtk3/gtkframe.cxx | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
New commits:
commit a7a1b836e55cda808472ade322b93a56ab82c40b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue May 11 15:33:24 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue May 11 17:56:51 2021 +0200
gtk4: reduce ifdefs
Change-Id: Ibfbc5a37666c233590cf2d4169730a89d37ff7f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115435
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 050f4ef3d5b2..e6363ee90164 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -2268,10 +2268,10 @@ void GtkSalFrame::SetPointer( PointerStyle
ePointerStyle )
m_ePointerStyle = ePointerStyle;
GdkCursor *pCursor = getDisplay()->getCursor( ePointerStyle );
-#if !GTK_CHECK_VERSION(4, 0, 0)
- gdk_window_set_cursor( gtk_widget_get_window(m_pWindow), pCursor );
-#else
+#if GTK_CHECK_VERSION(4, 0, 0)
gtk_widget_set_cursor(GTK_WIDGET(m_pWindow), pCursor);
+#else
+ gdk_window_set_cursor( gtk_widget_get_window(m_pWindow), pCursor );
#endif
// #i80791# use grabPointer the same way as CaptureMouse, respective float
grab
@@ -2322,13 +2322,13 @@ void GtkSalFrame::CaptureMouse( bool bCapture )
void GtkSalFrame::SetPointerPos( tools::Long nX, tools::Long nY )
{
+#if !GTK_CHECK_VERSION(4, 0, 0)
GtkSalFrame* pFrame = this;
while( pFrame && pFrame->isChild( false ) )
pFrame = pFrame->m_pParent;
if( ! pFrame )
return;
-#if !GTK_CHECK_VERSION(4, 0, 0)
GdkScreen *pScreen = gtk_widget_get_screen(pFrame->m_pWindow);
GdkDisplay *pDisplay = gdk_screen_get_display( pScreen );
@@ -2763,11 +2763,8 @@ void* GtkSalFrame::ShowPopover(const OUString&
rHelpText, vcl::Window* pParent,
gtk_popover_set_autohide(GTK_POPOVER(pWidget), false);
#endif
-#if !GTK_CHECK_VERSION(4, 0, 0)
- gtk_widget_show_all(pWidget);
-#else
+ gtk_widget_show(pLabel);
gtk_widget_show(pWidget);
-#endif
return pWidget;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
