TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix right-click menu deadlock on IE

Browse Source
This commit is contained in:
David Rose 2009-12-19 04:01:30 +00:00
parent 6eba1cf08a
commit 83b78b6587
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
panda/src/windisplay/winGraphicsWindow.cxx
View File

@ -1290,7 +1290,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
// A button-click in the window means to grab the keyboard focus. // A button-click in the window means to grab the keyboard focus.
set_focus(); set_focus();
break; return 0;
case WM_MBUTTONDOWN: case WM_MBUTTONDOWN:
if (_lost_keypresses) { if (_lost_keypresses) {
@ -1301,9 +1301,10 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
_input_devices[0].button_down(MouseButton::button(1), get_message_time()); _input_devices[0].button_down(MouseButton::button(1), get_message_time());
// A button-click in the window means to grab the keyboard focus. // A button-click in the window means to grab the keyboard focus.
set_focus(); set_focus();
break; return 0;
case WM_RBUTTONDOWN: case WM_RBUTTONDOWN:
cerr << "RBUTTONDOWN\n";
if (_lost_keypresses) { if (_lost_keypresses) {
resend_lost_keypresses(); resend_lost_keypresses();
} }
@ -1312,7 +1313,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
_input_devices[0].button_down(MouseButton::button(2), get_message_time()); _input_devices[0].button_down(MouseButton::button(2), get_message_time());
// A button-click in the window means to grab the keyboard focus. // A button-click in the window means to grab the keyboard focus.
set_focus(); set_focus();
break; return 0;
case WM_XBUTTONDOWN: case WM_XBUTTONDOWN:
{ {
@ -1328,7 +1329,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
_input_devices[0].button_down(MouseButton::button(4), get_message_time()); _input_devices[0].button_down(MouseButton::button(4), get_message_time());
} }
} }
break; return 0;
case WM_LBUTTONUP: case WM_LBUTTONUP:
if (_lost_keypresses) { if (_lost_keypresses) {
@ -1336,7 +1337,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
} }
ReleaseCapture(); ReleaseCapture();
_input_devices[0].button_up(MouseButton::button(0), get_message_time()); _input_devices[0].button_up(MouseButton::button(0), get_message_time());
break; return 0;
case WM_MBUTTONUP: case WM_MBUTTONUP:
if (_lost_keypresses) { if (_lost_keypresses) {
@ -1344,15 +1345,16 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
} }
ReleaseCapture(); ReleaseCapture();
_input_devices[0].button_up(MouseButton::button(1), get_message_time()); _input_devices[0].button_up(MouseButton::button(1), get_message_time());
break; return 0;
case WM_RBUTTONUP: case WM_RBUTTONUP:
cerr << "RBUTTONUP\n";
if (_lost_keypresses) { if (_lost_keypresses) {
resend_lost_keypresses(); resend_lost_keypresses();
} }
ReleaseCapture(); ReleaseCapture();
_input_devices[0].button_up(MouseButton::button(2), get_message_time()); _input_devices[0].button_up(MouseButton::button(2), get_message_time());
break; return 0;
case WM_XBUTTONUP: case WM_XBUTTONUP:
{ {
@ -1367,7 +1369,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
_input_devices[0].button_up(MouseButton::button(4), get_message_time()); _input_devices[0].button_up(MouseButton::button(4), get_message_time());
} }
} }
break; return 0;
case WM_MOUSEWHEEL: case WM_MOUSEWHEEL:
{ {