X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3400e2eb98cd814c19daa6aecddd5e707f6b4e6..cb7acf9cc78c309026bed1038631f2663cd90bda:/src/univ/themes/win32.cpp diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp index b7d8482bb1..56a353951f 100644 --- a/src/univ/themes/win32.cpp +++ b/src/univ/themes/win32.cpp @@ -3935,6 +3935,7 @@ bool wxWin32InputHandler::HandleMouse(wxInputConsumer *control, if ( event.ButtonDown() ) { wxWindow *win = control->GetInputWindow(); + if ( wxWindow::FindFocus() != control->GetInputWindow() ) { win->SetFocus(); @@ -4204,8 +4205,11 @@ wxWin32StatusBarInputHandler(wxInputHandler *handler) bool wxWin32StatusBarInputHandler::IsOnGrip(wxWindow *statbar, const wxPoint& pt) const { + wxTopLevelWindow *parentTLW = wxDynamicCast(statbar->GetParent(), wxTopLevelWindow); + if ( statbar->HasFlag(wxST_SIZEGRIP) && - statbar->GetParent()->HasFlag(wxRESIZE_BORDER) ) + statbar->GetParent()->HasFlag(wxRESIZE_BORDER) && + parentTLW && !parentTLW->IsMaximized() ) { wxSize sizeSbar = statbar->GetSize();