SalDisplay::Dispatch shall apparently return bool

Change-Id: I46ab0ef04b598a4154659f9a1e1cbb2164023b63

vcl/inc/unx/gtk/gtkdata.hxx

@@ -171,7 +171,7 @@ public:
 #if GTK_CHECK_VERSION(3,0,0)
     guint32 GetLastUserEventTime( bool /* b */ ) { return GDK_CURRENT_TIME; } // horrible hack
 #else
-    virtual long Dispatch( XEvent *pEvent );
+    virtual bool Dispatch( XEvent *pEvent );
 #endif
 };
 

vcl/inc/unx/saldisp.hxx

@@ -280,7 +280,7 @@ protected:
 
     mutable XLIB_Time  m_nLastUserEventTime; // mutable because changed on first access
 
-    virtual long    Dispatch( XEvent *pEvent ) = 0;
+    virtual bool    Dispatch( XEvent *pEvent ) = 0;
     void            InitXinerama();
     void            InitRandR( XLIB_Window aRoot ) const;
     void            DeInitRandR();
@@ -399,7 +399,7 @@ public:
              SalX11Display( Display* pDisp );
     virtual ~SalX11Display();
 
-    virtual long        Dispatch( XEvent *pEvent );
+    virtual bool        Dispatch( XEvent *pEvent );
     virtual void        Yield();
     virtual void        PostUserEvent();
 

vcl/inc/unx/salobj.h

@@ -68,7 +68,7 @@ public:
     SalClipRegion   maClipRegion;
     sal_Bool            mbVisible;
 
-    static VCL_DLLPUBLIC long Dispatch( XEvent* pEvent );
+    static VCL_DLLPUBLIC bool Dispatch( XEvent* pEvent );
     static VCL_DLLPUBLIC X11SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True );
 
     X11SalObject();

vcl/unx/generic/app/saldisp.cxx

@@ -1864,7 +1864,7 @@ void SalX11Display::Yield()
     GetX11SalData()->ResetXErrorOccurred();
 }
 
-long SalX11Display::Dispatch( XEvent *pEvent )
+bool SalX11Display::Dispatch( XEvent *pEvent )
 {
     if( pEvent->type == XLIB_KeyPress || pEvent->type == KeyRelease )
     {
@@ -1883,12 +1883,12 @@ long SalX11Display::Dispatch( XEvent *pEvent )
         if( it != m_aFrames.end() )
         {
             if ( mpInputMethod->FilterEvent( pEvent , aWindow ) )
-                return 0;
+                return false;
         }
     }
     else
         if ( mpInputMethod->FilterEvent( pEvent, None ) )
-            return 0;
+            return false;
 
     SalInstance* pInstance = GetSalData()->m_pInstance;
     pInstance->CallEventCallback( pEvent, sizeof( XEvent ) );
@@ -1913,7 +1913,7 @@ long SalX11Display::Dispatch( XEvent *pEvent )
                         std::list< SalFrame* >::const_iterator it;
                         for( it = m_aFrames.begin(); it != m_aFrames.end(); ++it )
                             (*it)->CallCallback( SALEVENT_SETTINGSCHANGED, NULL );
-                        return 0;
+                        return false;
                     }
                 }
             }
@@ -1939,7 +1939,7 @@ long SalX11Display::Dispatch( XEvent *pEvent )
                 && GetKbdExtension()->GetEventBase() == pEvent->type )
             {
                 GetKbdExtension()->Dispatch( pEvent );
-                return 1;
+                return true;
             }
             break;
     }
@@ -1968,7 +1968,7 @@ long SalX11Display::Dispatch( XEvent *pEvent )
     // is this perhaps a root window that changed size ?
     processRandREvent( pEvent );
 
-    return 0;
+    return false;
 }
 
 #ifdef DBG_UTIL

vcl/unx/generic/window/salobj.cxx

@@ -440,7 +440,7 @@ static sal_uInt16 sal_GetCode( int state )
     return nCode;
 }
 
-long X11SalObject::Dispatch( XEvent* pEvent )
+bool X11SalObject::Dispatch( XEvent* pEvent )
 {
     std::list< SalObject* >& rObjects = GetGenericData()->GetSalDisplay()->getSalObjects();
 
@@ -501,26 +501,26 @@ long X11SalObject::Dispatch( XEvent* pEvent )
                 {
                     case UnmapNotify:
                     pObject->mbVisible = sal_False;
-                    return 1;
+                    return true;
                     case MapNotify:
                     pObject->mbVisible = sal_True;
-                    return 1;
+                    return true;
                     case ButtonPress:
                     pObject->CallCallback( SALOBJ_EVENT_TOTOP, NULL );
-                    return 1;
+                    return true;
                     case FocusIn:
                     pObject->CallCallback( SALOBJ_EVENT_GETFOCUS, NULL );
-                    return 1;
+                    return true;
                     case FocusOut:
                     pObject->CallCallback( SALOBJ_EVENT_LOSEFOCUS, NULL );
-                    return 1;
+                    return true;
                     default: break;
                 }
             }
-            return 0;
+            return false;
         }
     }
-    return 0;
+    return false;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/unx/gtk/app/gtkdata.cxx

@@ -222,7 +222,7 @@ GtkSalDisplay::initScreen( SalX11Screen nXScreen ) const
     return pSD;
 }
 
-long GtkSalDisplay::Dispatch( XEvent* pEvent )
+bool GtkSalDisplay::Dispatch( XEvent* pEvent )
 {
     if( GetDisplay() == pEvent->xany.display )
     {
@@ -236,7 +236,7 @@ long GtkSalDisplay::Dispatch( XEvent* pEvent )
         }
     }
 
-    return GDK_FILTER_CONTINUE;
+    return false;
 }
 #endif
 

vcl/unx/kde4/VCLKDEApplication.cxx

@@ -32,7 +32,7 @@ bool VCLKDEApplication::x11EventFilter(XEvent* ev)
 {
     //if we have a display and the display consumes the event
     //do not process the event in qt
-    if (SalKDEDisplay::self() && SalKDEDisplay::self()->Dispatch(ev) > 0)
+    if (SalKDEDisplay::self() && SalKDEDisplay::self()->Dispatch(ev))
     {
         return true;
     }