X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9bb3479c68dd8e6cde9c997f4221fc5cfc5ca110..399b60a0ad232265cd74ce8bf6a53a1f2cc57ff2:/src/msw/dialog.cpp?ds=inline diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index 888b7713d7..4a0102db14 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -98,6 +98,7 @@ END_EVENT_TABLE() wxDialog::wxDialog() { + m_oldFocus = (wxWindow *)NULL; m_isShown = FALSE; SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); @@ -110,6 +111,8 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, long style, const wxString& name) { + m_oldFocus = FindFocus(); + SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); SetName(name); @@ -206,26 +209,10 @@ wxDialog::~wxDialog() wxTopLevelWindows.DeleteObject(this); + // this will call BringWindowToTop() if necessary to bring back our parent + // window to top Show(FALSE); - // VZ: this is bogus and breaks focus handling - it won't be returned to - // the window which had it previosuly if we do this -#if 0 - if (m_modalShowing) - { - // For some reason, wxWindows can activate another task altogether - // when a frame is destroyed after a modal dialog has been invoked. - // Try to bring the parent to the top. - // dfgg: I moved this following line from end of function - - // must not call if another window is on top!! - // This can often happen with Close() and delayed deleting - if (GetParent() && GetParent()->GetHWND()) - ::BringWindowToTop((HWND) GetParent()->GetHWND()); - } - - m_modalShowing = FALSE; -#endif // 0 - if ( !IsModal() ) wxModelessWindows.DeleteObject(this); @@ -248,24 +235,26 @@ wxDialog::~wxDialog() // By default, pressing escape cancels the dialog void wxDialog::OnCharHook(wxKeyEvent& event) { - if (GetHWND()) - { - if (event.m_keyCode == WXK_ESCAPE) + if (GetHWND()) { - // Behaviour changed in 2.0: we'll send a Cancel message - // to the dialog instead of Close. - wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - cancelEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(cancelEvent); - - // ensure that there is another message for this window so the - // ShowModal loop will exit and won't get stuck in GetMessage(). - ::PostMessage(GetHwnd(), WM_NULL, 0, 0); - return; + // "Esc" works as an accelerator for the "Cancel" button, but it + // shouldn't close the dialog which doesn't have any cancel button + if ( (event.m_keyCode == WXK_ESCAPE) && FindWindow(wxID_CANCEL) ) + { + wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); + cancelEvent.SetEventObject( this ); + GetEventHandler()->ProcessEvent(cancelEvent); + + // ensure that there is another message for this window so the + // ShowModal loop will exit and won't get stuck in GetMessage(). + ::PostMessage(GetHwnd(), WM_NULL, 0, 0); + + return; + } } - } - // We didn't process this event. - event.Skip(); + + // We didn't process this event. + event.Skip(); } // ---------------------------------------------------------------------------- @@ -327,194 +316,6 @@ bool wxDialog::IsModal() const return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0; } -// VZ: this is the old version unchanged (reindented only), it will be removed -// as soon as we're sure the new one works correctly -#if 0 - -bool wxDialog::Show(bool show) -{ - m_isShown = show; - - if (show) - InitDialog(); - - bool modal = IsModal(); - - if (modal) - { - if (show) - { - // find the top level window which had focus before - we will restore - // focus to it later - m_hwndOldFocus = 0; - for ( HWND hwnd = ::GetFocus(); hwnd; hwnd = ::GetParent(hwnd) ) - { - m_hwndOldFocus = (WXHWND)hwnd; - } - - if (m_modalShowing) - { - BringWindowToTop((HWND) GetHWND()); - return TRUE; - } - - m_modalShowing = TRUE; - wxNode *node = wxModalDialogs.First(); - while (node) - { - wxDialog *box = (wxDialog *)node->Data(); - if (box != this) - ::EnableWindow((HWND) box->GetHWND(), FALSE); - node = node->Next(); - } - - // if we don't do it, some window might be deleted while we have pointers - // to them in our disabledWindows list and the program will crash when it - // will try to reenable them after the modal dialog end - wxTheApp->DeletePendingObjects(); - wxList disabledWindows; - - node = wxModelessWindows.First(); - while (node) - { - wxWindow *win = (wxWindow *)node->Data(); - if (::IsWindowEnabled((HWND) win->GetHWND())) - { - ::EnableWindow((HWND) win->GetHWND(), FALSE); - disabledWindows.Append(win); - } - node = node->Next(); - } - - ShowWindow((HWND) GetHWND(), SW_SHOW); - EnableWindow((HWND) GetHWND(), TRUE); - BringWindowToTop((HWND) GetHWND()); - - if ( !wxModalDialogs.Find(this) ) - wxModalDialogs.Append(this); - - MSG msg; - // Must test whether this dialog still exists: we may not process - // a message before the deletion. - while (wxModalDialogs.Find(this) && m_modalShowing && GetMessage(&msg, NULL, 0, 0)) - { - if ( m_acceleratorTable.Ok() && - ::TranslateAccelerator((HWND)GetHWND(), - (HACCEL)m_acceleratorTable.GetHACCEL(), - &msg) ) - { - // Have processed the message - } - else if ( !wxTheApp->ProcessMessage((WXMSG *)&msg) ) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - - // If we get crashes (as per George Tasker's message) with nested modal dialogs, - // we should try removing the m_modalShowing test - - if (m_modalShowing && !::PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE)) - // dfgg: NB MUST test m_modalShowing again as the message loop could have triggered - // a Show(FALSE) in the mean time!!! - // Without the test, we might delete the dialog before the end of modal showing. - { - while (wxTheApp->ProcessIdle() && m_modalShowing) - { - // Keep going until we decide we've done enough - } - } - } - // dfgg: now must specifically re-enable all other app windows that we disabled earlier - node=disabledWindows.First(); - while(node) { - wxWindow* win = (wxWindow*) node->Data(); - if (wxModalDialogs.Find(win) || wxModelessWindows.Find(win)) - { - HWND hWnd = (HWND) win->GetHWND(); - if (::IsWindow(hWnd)) - ::EnableWindow(hWnd,TRUE); - } - node=node->Next(); - } - } - else // !show - { - ::SetFocus((HWND)m_hwndOldFocus); - - wxModalDialogs.DeleteObject(this); - - wxNode *last = wxModalDialogs.Last(); - - // If there's still a modal dialog active, we - // enable it, else we enable all modeless windows - if (last) - { - // VZ: I don't understand what this is supposed to do, so I'll leave - // it out for now and look for horrible consequences - wxDialog *box = (wxDialog *)last->Data(); - HWND hwnd = (HWND) box->GetHWND(); -#if 0 - if (box->IsUserEnabled()) -#endif // 0 - EnableWindow(hwnd, TRUE); - BringWindowToTop(hwnd); - } - else - { - wxNode *node = wxModelessWindows.First(); - while (node) - { - wxWindow *win = (wxWindow *)node->Data(); - HWND hwnd = (HWND) win->GetHWND(); - // Only enable again if not user-disabled. -#if 0 - if (win->IsUserEnabled()) -#endif // 0 - EnableWindow(hwnd, TRUE); - node = node->Next(); - } - } - // Try to highlight the correct window (the parent) - HWND hWndParent = 0; - if (GetParent()) - { - hWndParent = (HWND) GetParent()->GetHWND(); - if (hWndParent) - ::BringWindowToTop(hWndParent); - } - ShowWindow((HWND) GetHWND(), SW_HIDE); - m_modalShowing = FALSE; - } - } - else // !modal - { - if (show) - { - ShowWindow((HWND) GetHWND(), SW_SHOW); - BringWindowToTop((HWND) GetHWND()); - } - else - { - // Try to highlight the correct window (the parent) - HWND hWndParent = 0; - if (GetParent()) - { - hWndParent = (HWND) GetParent()->GetHWND(); - if (hWndParent) - ::BringWindowToTop(hWndParent); - } - - if ( m_hWnd ) - ShowWindow((HWND) GetHWND(), SW_HIDE); - } - } - - return TRUE; -} - -#else // 1 - bool wxDialog::IsModalShowing() const { return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast @@ -529,14 +330,13 @@ void wxDialog::DoShowModal() wxWindow *parent = GetParent(); // remember where the focus was - wxWindow *winFocus = FindFocus(); - if ( !winFocus ) + if ( !m_oldFocus ) { - winFocus = parent; + m_oldFocus = parent; } - if ( !winFocus ) + if ( !m_oldFocus ) { - winFocus = wxTheApp->GetTopWindow(); + m_oldFocus = wxTheApp->GetTopWindow(); } // disable the parent window first @@ -567,15 +367,29 @@ void wxDialog::DoShowModal() } // and restore focus - if ( winFocus && (winFocus != this) ) + if ( m_oldFocus && (m_oldFocus != this) ) { - winFocus->SetFocus(); + m_oldFocus->SetFocus(); } } bool wxDialog::Show(bool show) { - if ( !wxDialogBase::Show(show) ) + // The following is required when the parent has been disabled, (modal + // dialogs, or modeless dialogs with disabling such as wxProgressDialog). + // Otherwise the parent disappears behind other windows when the dialog is + // hidden. + if ( !show ) + { + wxWindow *parent = GetParent(); + if ( parent ) + { + ::BringWindowToTop(GetHwndOf(parent)); + } + } + + // ShowModal() may be called for already shown dialog + if ( !wxDialogBase::Show(show) && !(show && IsModal()) ) { // nothing to do return FALSE; @@ -604,13 +418,32 @@ bool wxDialog::Show(bool show) return TRUE; } -#endif // 0/1 - // Replacement for Show(TRUE) for modal dialogs - returns return code int wxDialog::ShowModal() { + // modal dialog needs a parent window, so try to find one + if ( !GetParent() ) + { + wxWindow *parent = wxTheApp->GetTopWindow(); + if ( parent && parent != this ) + { + // use it + m_parent = parent; + } + } + + wxWindowDisabler *wd = (wxWindowDisabler *)NULL; + if ( !GetParent() ) + { + // still no parent? make the dialog app modal by disabling all windows + wd = new wxWindowDisabler(this); + } + m_windowStyle |= wxDIALOG_MODAL; Show(TRUE); + + delete wd; + return GetReturnCode(); } @@ -619,6 +452,7 @@ int wxDialog::ShowModal() void wxDialog::EndModal(int retCode) { SetReturnCode(retCode); + Show(FALSE); } @@ -710,11 +544,64 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) switch ( message ) { + case WM_ACTIVATE: + switch ( LOWORD(wParam) ) + { + case WA_ACTIVE: + case WA_CLICKACTIVE: + if ( IsModalShowing() && GetParent() ) + { + // bring the owner window to top as the standard dialog + // boxes do + if ( !::SetWindowPos + ( + GetHwndOf(GetParent()), + GetHwnd(), + 0, 0, + 0, 0, + SWP_NOACTIVATE | + SWP_NOMOVE | + SWP_NOSIZE + ) ) + { + wxLogLastError("SetWindowPos(SWP_NOACTIVATE)"); + } + } + // fall through to process it normally as well + } + break; + case WM_CLOSE: // if we can't close, tell the system that we processed the // message - otherwise it would close us processed = !Close(); break; + + case WM_SETCURSOR: + // we want to override the busy cursor for modal dialogs: + // typically, wxBeginBusyCursor() is called and then a modal dialog + // is shown, but the modal dialog shouldn't have hourglass cursor + if ( IsModalShowing() && wxIsBusy() ) + { + // set our cursor for all windows (but see below) + wxCursor cursor = m_cursor; + if ( !cursor.Ok() ) + cursor = wxCURSOR_ARROW; + + ::SetCursor(GetHcursorOf(cursor)); + + // in any case, stop here and don't let wxWindow process this + // message (it would set the busy cursor) + processed = TRUE; + + // but return FALSE to tell the child window (if the event + // comes from one of them and not from ourselves) that it can + // set its own cursor if it has one: thus, standard controls + // (e.g. text ctrl) still have correct cursors in a dialog + // invoked while wxIsBusy() + rc = FALSE; + } + break; } if ( !processed )