diff options
| -rw-r--r-- | graphics/macgui/mactextwindow.cpp | 3 | ||||
| -rw-r--r-- | graphics/macgui/macwindow.cpp | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp index 9bbf2c8d10..85a07b975e 100644 --- a/graphics/macgui/mactextwindow.cpp +++ b/graphics/macgui/mactextwindow.cpp @@ -306,6 +306,9 @@ bool MacTextWindow::processEvent(Common::Event &event) { } } + if (hasAllFocus()) + return MacWindow::processEvent(event); // Pass it to upstream + if (click == kBorderScrollUp || click == kBorderScrollDown) { if (event.type == Common::EVENT_LBUTTONDOWN) { int consoleHeight = getInnerDimensions().height(); diff --git a/graphics/macgui/macwindow.cpp b/graphics/macgui/macwindow.cpp index 227f789d30..7b9afa4157 100644 --- a/graphics/macgui/macwindow.cpp +++ b/graphics/macgui/macwindow.cpp @@ -459,7 +459,9 @@ bool MacWindow::processEvent(Common::Event &event) { _draggedY = event.mouse.y; _wm->setFullRefresh(true); - (*_callback)(click, event, _dataPtr); + + if (_callback) + (*_callback)(click, event, _dataPtr); } break; case Common::EVENT_LBUTTONDOWN: |