From: Smirnov Egor <s.e.a.98@yandex.ru>
Date: Wed, 16 Jun 2021 08:36:13 +0000 (+0300)
Subject: reorder defined checks according to cmake file
X-Git-Tag: accepted/tizen/unified/20220125.121719~1^2~27^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a276f39fbfe975b971cc5030077fe57faf85ca4;p=platform%2Fupstream%2Fopencv.git

reorder defined checks according to cmake file
---

diff --git a/modules/highgui/src/window.cpp b/modules/highgui/src/window.cpp
index dca6ddb..56c1456 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,