From 7a276f39fbfe975b971cc5030077fe57faf85ca4 Mon Sep 17 00:00:00 2001 From: Smirnov Egor Date: Wed, 16 Jun 2021 11:36:13 +0300 Subject: [PATCH] reorder defined checks according to cmake file --- modules/highgui/src/window.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/highgui/src/window.cpp b/modules/highgui/src/window.cpp index dca6ddbaf878..56c1456a5d95 100644 --- a/modules/highgui/src/window.cpp +++ b/modules/highgui/src/window.cpp @@ -630,9 +630,8 @@ int cv::waitKey(int delay) return (code != -1) ? (code & 0xff) : -1; } -#if defined(HAVE_WIN32UI) -// pollKey() implemented in window_w32.cpp -#elif defined(HAVE_GTK) || defined(HAVE_COCOA) || defined(HAVE_QT) || (defined (WINRT) && !defined (WINRT_8_0)) +#if defined(HAVE_QT) || (defined (WINRT) && !defined (WINRT_8_0)) || \ + !defined(HAVE_WIN32UI) && (defined(HAVE_GTK) || defined(HAVE_COCOA)) // pollKey() fallback implementation int cv::pollKey() { @@ -650,6 +649,8 @@ int cv::pollKey() // fallback. please implement a proper polling function return cvWaitKey(1); } +#elif defined(HAVE_WIN32UI) +// pollKey() implemented in window_w32.cpp #endif int cv::createTrackbar(const String& trackbarName, const String& winName,