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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit d001e1fa04c4fc29bad6ef6cce146aac38bb7fe1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 8 17:27:00 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jan 8 20:08:51 2020 +0100

    can expand these macros since gtk2 is gone
    
    Change-Id: Id688ca75e1dd5917025ac6c6df91b4b549f82c23
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86450
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 178b0ac6aa30..8dddd5fb2b9e 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -60,9 +60,6 @@
 #include <com/sun/star/awt/MouseButton.hpp>
 #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
 
-#define IS_WIDGET_REALIZED gtk_widget_get_realized
-#define IS_WIDGET_MAPPED   gtk_widget_get_mapped
-
 using namespace com::sun::star;
 
 int GtkSalFrame::m_nFloats = 0;
@@ -1741,7 +1738,7 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, SetType eType, tools::Rect
     }
 
     bool bResize = false;
-    bool bVisible = IS_WIDGET_MAPPED( m_pWindow );
+    bool bVisible = gtk_widget_get_mapped( m_pWindow );
     if( bVisible )
         Show( false );
 
@@ -1838,7 +1835,7 @@ void GtkSalFrame::updateWMClass()
 
     display = GDK_DISPLAY_XDISPLAY(getGdkDisplay());
 
-    if( IS_WIDGET_REALIZED( m_pWindow ) )
+    if( gtk_widget_get_realized( m_pWindow ) )
     {
         XClassHint* pClass = XAllocClassHint();
         OString aResName = SalGenericSystem::getFrameResName();
@@ -1932,7 +1929,7 @@ void GtkSalFrame::ToTop( SalFrameToTop nFlags )
             gtk_widget_set_can_focus(GTK_WIDGET(m_pFixedContainer), true);
             gtk_widget_grab_focus(GTK_WIDGET(m_pFixedContainer));
         }
-        else if( IS_WIDGET_MAPPED( m_pWindow ) )
+        else if( gtk_widget_get_mapped( m_pWindow ) )
         {
             if (!(nFlags & SalFrameToTop::GrabFocusOnly))
                 gtk_window_present_with_time(GTK_WINDOW(m_pWindow), GetLastInputEventTime());