Skip to content

O
opencv
Commit 03c4c67d authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #15518 from mshabunin:fix-osx-qt

parents f5f91877 5c0502b4
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
modules/highgui/src/window.cpp
View file @ 03c4c67d
...@@ -85,12 +85,12 @@ CV_IMPL void cvSetWindowProperty(const char* name, int prop_id, double prop_valu ...@@ -85,12 +85,12 @@ CV_IMPL void cvSetWindowProperty(const char* name, int prop_id, double prop_valu
break; break;
case cv::WND_PROP_TOPMOST: case cv::WND_PROP_TOPMOST:
#if defined(HAVE_WIN32UI) #if defined (HAVE_QT)
// nothing
#elif defined(HAVE_WIN32UI)
cvSetPropTopmost_W32(name, (prop_value != 0 ? true : false)); cvSetPropTopmost_W32(name, (prop_value != 0 ? true : false));
#elif defined(HAVE_COCOA) #elif defined(HAVE_COCOA)
cvSetPropTopmost_COCOA(name, (prop_value != 0 ? true : false)); cvSetPropTopmost_COCOA(name, (prop_value != 0 ? true : false));
#else
CV_LOG_WARNING(NULL, "Property WND_PROP_TOPMOST is not supported on current GUI backend");
#endif #endif
break; break;
...@@ -175,12 +175,13 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id) ...@@ -175,12 +175,13 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
break; break;
case cv::WND_PROP_TOPMOST: case cv::WND_PROP_TOPMOST:
#if defined(HAVE_WIN32UI) #if defined (HAVE_QT)
return -1;
#elif defined(HAVE_WIN32UI)
return cvGetPropTopmost_W32(name); return cvGetPropTopmost_W32(name);
#elif defined(HAVE_COCOA) #elif defined(HAVE_COCOA)
return cvGetPropTopmost_COCOA(name); return cvGetPropTopmost_COCOA(name);
#else #else
CV_LOG_WARNING(NULL, "Property WND_PROP_TOPMOST is not supported on current GUI backend");
return -1; return -1;
#endif #endif
break; break;
......
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