Mercurial > hg > orthanc-stone
diff Samples/Deprecated/WebAssembly/BasicMPR.cpp @ 1370:28eb7106ef44 broker
Changes to GuiAdapter to allow it to work correctly with both new and old
Emscripten event selection rules that are defined by the DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR linker flag.
Doc has been added to GuiAdapter.cpp, should you require more info on
what has been done.
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Mon, 20 Apr 2020 13:08:43 +0200 |
| parents | eac254fb6791 |
| children |
line wrap: on
line diff
--- a/Samples/Deprecated/WebAssembly/BasicMPR.cpp Sat Apr 18 14:45:38 2020 +0200 +++ b/Samples/Deprecated/WebAssembly/BasicMPR.cpp Mon Apr 20 13:08:43 2020 +0200 @@ -396,14 +396,14 @@ } widget3_->UpdateSize(); - emscripten_set_resize_callback("#window", NULL, false, OnWindowResize); + emscripten_set_resize_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, NULL, false, OnWindowResize); // DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=1 !! - emscripten_set_wheel_callback("mycanvas1", widget1_.get(), false, OnMouseWheel); - emscripten_set_wheel_callback("mycanvas2", widget2_.get(), false, OnMouseWheel); - emscripten_set_wheel_callback("mycanvas3", widget3_.get(), false, OnMouseWheel); + emscripten_set_wheel_callback("#mycanvas1", widget1_.get(), false, OnMouseWheel); + emscripten_set_wheel_callback("#mycanvas2", widget2_.get(), false, OnMouseWheel); + emscripten_set_wheel_callback("#mycanvas3", widget3_.get(), false, OnMouseWheel); - emscripten_set_keydown_callback("#window", NULL, false, OnKeyDown); - emscripten_set_keyup_callback("#window", NULL, false, OnKeyUp); + emscripten_set_keydown_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, NULL, false, OnKeyDown); + emscripten_set_keyup_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, NULL, false, OnKeyUp); emscripten_request_animation_frame_loop(OnAnimationFrame, NULL);