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

[Caolán McNamara]

 vcl/source/window/winproc.cxx |    4 ----
 vcl/unx/gtk3/gtk3gtkframe.cxx |    3 ---
 2 files changed, 7 deletions(-)

New commits:
commit 43fbd02a82f9c87c75e83671c95c2617cc30d035
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 4 11:35:36 2016 +0100

    this flush refers to the gtk2/X impl
    
    where there is two connections to the display, for gtk3 there
    is just the one connection
    
    Change-Id: I2da02efa12205ab4ca39d9585965e5d6d0adf474

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index b0a4e62..8e12b96 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1462,9 +1462,6 @@ void GtkSalFrame::Show( bool bVisible, bool /*bNoActivate*/ )
             gtk_widget_hide( m_pWindow );
             if( m_pIMHandler )
                 m_pIMHandler->focusChanged( false );
-            // flush here; there may be a very seldom race between
-            // the display connection used for clipboard and our connection
-            Flush();
         }
     }
 }
commit a760ff5b41612c0c6aefeac5fb06691f819ceee2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 1 21:17:18 2016 +0100

    lets assume its ok this was commented out
    
    Change-Id: Ic22c8b1f0f0b9e7427eae756f9f16630f951baa6

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 7333612..5093c1e 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -364,10 +364,6 @@ bool ImplHandleMouseEvent( const VclPtr<vcl::Window>& xWindow, MouseNotifyEvent
             const OutputDevice *pChildWinOutDev = pChild->GetOutDev();
             pChildWinOutDev->ReMirror( aMousePos );
         }
-        // no mouse messages to system object windows ?
-        // !!!KA: Is it OK to comment this out? !!!
-//        if ( pChild->ImplGetWindowImpl()->mpSysObj )
-//            return false;
 
         // no mouse messages to disabled windows
         // #106845# if the window was disabled during capturing we have to pass the mouse events to release capturing