Skip to content

Commit

Permalink
reorder defined checks according to cmake file
Browse files Browse the repository at this point in the history
  • Loading branch information
rogday committed Jun 16, 2021
1 parent 651967b commit 7a276f3
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions modules/highgui/src/window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand All @@ -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,
Expand Down

0 comments on commit 7a276f3

Please sign in to comment.