Commit 81c69ecd authored by Alexandr Kondratev's avatar Alexandr Kondratev

highgui: window_gtk.cpp directive boolean operations or/and replaced by ||/&& to…

highgui: window_gtk.cpp directive boolean operations or/and replaced by ||/&& to keep compatible with older systems
parent a4e97120
...@@ -1993,10 +1993,10 @@ static gboolean icvOnMouse( GtkWidget *widget, GdkEvent *event, gpointer user_da ...@@ -1993,10 +1993,10 @@ static gboolean icvOnMouse( GtkWidget *widget, GdkEvent *event, gpointer user_da
case GDK_SCROLL_LEFT: orient = CV_EVENT_MOUSEHWHEEL; case GDK_SCROLL_LEFT: orient = CV_EVENT_MOUSEHWHEEL;
case GDK_SCROLL_DOWN: flags |= ((-1 << 16) | orient); case GDK_SCROLL_DOWN: flags |= ((-1 << 16) | orient);
break; break;
#if (GTK_MAJOR_VERSION > 3 or (GTK_MAJOR_VERSION == 3 and GTK_MINOR_VERSION >= 4)) #if (GTK_MAJOR_VERSION > 3 || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 4))
case GDK_SCROLL_SMOOTH: // to prevent make warning; TODO case GDK_SCROLL_SMOOTH: // to prevent make warning; TODO
; ;
#endif //GTK_MAJOR_VERSION > 3 or (GTK_MAJOR_VERSION == 3 and GTK_MINOR_VERSION >= 4) #endif //GTK_MAJOR_VERSION > 3 || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 4)
}; };
}; };
flags = flags | flags = flags |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment