potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'origin/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Smorkalov
2023-04-20 16:44:22 +03:00
parent 4c06a721ef fd8b346c3e
commit e4a29d93fe
26 changed files with 336 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/src/window_cocoa.mm
+1 -1
View File
@@ -626,7 +626,7 @@ CV_IMPL int cvWaitKey (int maxWait)
inMode:NSDefaultRunLoopMode
dequeue:YES];
if([event type] == NSKeyDown) {
if([event type] == NSKeyDown && [[event characters] length]) {
returnCode = [[event characters] characterAtIndex:0];
break;
}
modules/highgui/src/window_w32.cpp
-15
View File
@@ -2420,21 +2420,6 @@ std::shared_ptr<CvTrackbar> createTrackbar_(CvWindow& window, const std::string&
/* Retrieve current buttons count */
int bcount = (int)SendMessage(window.toolbar.toolbar, TB_BUTTONCOUNT, 0, 0);
if (bcount > 0)
{
/* If this is not the first button then we need to
separate it from the previous one */
tbs.iBitmap = 0;
tbs.idCommand = bcount; // Set button id to it's number
tbs.iString = 0;
tbs.fsStyle = TBSTYLE_SEP;
tbs.fsState = TBSTATE_ENABLED;
SendMessage(window.toolbar.toolbar, TB_ADDBUTTONS, 1, (LPARAM)&tbs);
// Retrieve current buttons count
bcount = (int)SendMessage(window.toolbar.toolbar, TB_BUTTONCOUNT, 0, 0);
}
/* Add a button which we're going to cover with the slider */
tbs.iBitmap = 0;
tbs.idCommand = bcount; // Set button id to it's number