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

[Stephan Bergmann]

 vcl/unx/gtk/app/gtkinst.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit fbe26ca557fc9dfd1ed904d08251b6cd34e6ce5d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 7 11:04:16 2015 +0100

    VclInputFlags fix
    
    Change-Id: I60c989a86ad94d35c7bfa650a0bd993a23b26c0d

diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index c93dbe2..99efa22 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -115,9 +115,9 @@ extern "C"
 }
 
 #if GTK_CHECK_VERSION(3,0,0)
-static sal_uInt16 categorizeEvent(const GdkEvent *pEvent)
+static VclInputFlags categorizeEvent(const GdkEvent *pEvent)
 {
-    sal_uInt16 nType = 0;
+    VclInputFlags nType = VclInputFlags::NONE;
     switch( pEvent->type )
     {
     case GDK_MOTION_NOTIFY:
@@ -425,8 +425,8 @@ bool GtkInstance::AnyInput( VclInputFlags nType )
     while ((pEvent = gdk_event_get()))
     {
         aEvents.push(pEvent);
-        sal_uInt16 nEventType = categorizeEvent(pEvent);
-        if ( (nEventType & nType) || ( ! nEventType && (nType & VclInputFlags::OTHER) ) )
+        VclInputFlags nEventType = categorizeEvent(pEvent);
+        if ( (nEventType & nType) || ( nEventType == VclInputFlags::NONE && (nType & VclInputFlags::OTHER) ) )
         {
             bRet = true;
             break;