diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-24 09:37:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-24 09:40:30 +0200 |
| commit | 025c58f7ea613c2271e43e6639d734e4d478621d (patch) | |
| tree | 46a4d3c649a7ed18e27766fee8aceb0b8e4e40b2 /vcl/unx/gtk | |
| parent | 78bb1a2a51a991f605ae5c51d813697673bbc670 (diff) | |
fix kde4 vclplug build
by reverting parts of
commit de8f6b25de6fbe813fe172542e7eff1596b37335
loplugin:unused-returns in vcl
and reverting
commit 78bb1a2a51a991f605ae5c51d813697673bbc67
Fix --enable-kde4 codeHEAD
<noelgrandin> sberg, is that safe ^^ ? I was just about to push a partial revert of the commit that caused the breakage
<sberg> noelgrandin, oops, I'd naively assumed that all impls of Dispatch had just always returned true
Change-Id: Icbca450a76de30a04bc90a2887066840191c9d5f
Diffstat (limited to 'vcl/unx/gtk')
| -rw-r--r-- | vcl/unx/gtk/gtkdata.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vcl/unx/gtk/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx index 9c96b8fde049..7c9a3d1e0fbc 100644 --- a/vcl/unx/gtk/gtkdata.cxx +++ b/vcl/unx/gtk/gtkdata.cxx @@ -205,7 +205,7 @@ GtkSalDisplay::initScreen( SalX11Screen nXScreen ) const return pSD; } -void GtkSalDisplay::Dispatch( XEvent* pEvent ) +bool GtkSalDisplay::Dispatch( XEvent* pEvent ) { if( GetDisplay() == pEvent->xany.display ) { @@ -214,12 +214,11 @@ void GtkSalDisplay::Dispatch( XEvent* pEvent ) for (auto pSalFrame : m_aFrames ) { if (pSalFrame->GetSystemData()->aWindow == pEvent->xany.window) - { - static_cast<GtkSalFrame*>( pSalFrame )->Dispatch( pEvent ); - return; - } + return static_cast<GtkSalFrame*>( pSalFrame )->Dispatch( pEvent ); } } + + return false; } GdkCursor* GtkSalDisplay::getFromXBM( const unsigned char *pBitmap, |