Skip to content

O
opencv
Commit d47f3258 authored by Roman Donchenko's avatar Roman Donchenko Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #2174 from Nerei:yet_another_fix_for_pr2172

parents f60f8a73 5ea3ecdc
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
modules/highgui/src/window_w32.cpp
View file @ d47f3258
...@@ -90,6 +90,10 @@ static const char* trackbar_text = ...@@ -90,6 +90,10 @@ static const char* trackbar_text =
#endif #endif
#ifndef WM_MOUSEHWHEEL
#define WM_MOUSEHWHEEL 0x020E
#endif
static void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin ) static void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin )
{ {
assert( bmi && width >= 0 && height >= 0 && (bpp == 8 || bpp == 24 || bpp == 32)); assert( bmi && width >= 0 && height >= 0 && (bpp == 8 || bpp == 24 || bpp == 32));
...@@ -1363,9 +1367,7 @@ MainWindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) ...@@ -1363,9 +1367,7 @@ MainWindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
break; break;
case WM_MOUSEWHEEL: case WM_MOUSEWHEEL:
#if defined WM_MOUSEHWHEEL
case WM_MOUSEHWHEEL: case WM_MOUSEHWHEEL:
#endif
if( window->on_mouse ) if( window->on_mouse )
{ {
int flags = (wParam & MK_LBUTTON ? CV_EVENT_FLAG_LBUTTON : 0)| int flags = (wParam & MK_LBUTTON ? CV_EVENT_FLAG_LBUTTON : 0)|
......
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