Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
5c0502b4
Commit
5c0502b4
authored
5 years ago
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed OSX build with Qt
parent
8609198b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
window.cpp
modules/highgui/src/window.cpp
+6
-5
No files found.
modules/highgui/src/window.cpp
View file @
5c0502b4
...
...
@@ -85,12 +85,12 @@ CV_IMPL void cvSetWindowProperty(const char* name, int prop_id, double prop_valu
break
;
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
));
#elif defined(HAVE_COCOA)
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
break
;
...
...
@@ -175,12 +175,13 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
break
;
case
cv
:
:
WND_PROP_TOPMOST
:
#if defined(HAVE_WIN32UI)
#if defined (HAVE_QT)
return
-
1
;
#elif defined(HAVE_WIN32UI)
return
cvGetPropTopmost_W32
(
name
);
#elif defined(HAVE_COCOA)
return
cvGetPropTopmost_COCOA
(
name
);
#else
CV_LOG_WARNING
(
NULL
,
"Property WND_PROP_TOPMOST is not supported on current GUI backend"
);
return
-
1
;
#endif
break
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment