X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19193a2c85987b595932957e73013e7ea100f0e8..008881c3f0ccbbc6d2b73fd9151c85ea243f88b1:/src/os2/dialog.cpp diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp index aff9dac015..820367c6d4 100644 --- a/src/os2/dialog.cpp +++ b/src/os2/dialog.cpp @@ -24,6 +24,8 @@ #include "wx/os2/private.h" #include "wx/log.h" +#include "wx/evtloop.h" +#include "wx/ptr_scpd.h" #define wxDIALOG_DEFAULT_X 300 #define wxDIALOG_DEFAULT_Y 300 @@ -31,30 +33,60 @@ #define wxDIALOG_DEFAULT_WIDTH 500 #define wxDIALOG_DEFAULT_HEIGHT 500 -// Lists to keep track of windows, so we can disable/enable them -// for modal dialogs -wxWindowList wxModalDialogs; -wxWindowList wxModelessWindows; // Frames and modeless dialogs -extern wxList WXDLLEXPORT wxPendingDelete; +IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) - IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) +BEGIN_EVENT_TABLE(wxDialog, wxDialogBase) + EVT_BUTTON(wxID_OK, wxDialog::OnOK) + EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) + EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) + EVT_CHAR_HOOK(wxDialog::OnCharHook) + EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged) - BEGIN_EVENT_TABLE(wxDialog, wxPanel) - EVT_SIZE(wxDialog::OnSize) - EVT_BUTTON(wxID_OK, wxDialog::OnOK) - EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) - EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) - EVT_CHAR_HOOK(wxDialog::OnCharHook) - EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged) - EVT_CLOSE(wxDialog::OnCloseWindow) - END_EVENT_TABLE() + EVT_CLOSE(wxDialog::OnCloseWindow) +END_EVENT_TABLE() + +// ---------------------------------------------------------------------------- +// wxDialogModalData +// ---------------------------------------------------------------------------- + +// this is simply a container for any data we need to implement modality which +// allows us to avoid changing wxDialog each time the implementation changes +class wxDialogModalData +{ +public: + wxDialogModalData(wxDialog *dialog) : m_evtLoop(dialog) { } + + void RunLoop() + { + m_evtLoop.Run(); + } + + void ExitLoop() + { + m_evtLoop.Exit(); + } + +private: + wxModalEventLoop m_evtLoop; +}; + +wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData); + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxDialog construction +// ---------------------------------------------------------------------------- void wxDialog::Init() { m_pOldFocus = (wxWindow *)NULL; m_isShown = FALSE; m_pWindowDisabler = (wxWindowDisabler *)NULL; - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); + m_modalData = NULL; + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); } // end of wxDialog::Init bool wxDialog::Create( @@ -67,111 +99,67 @@ bool wxDialog::Create( , const wxString& rsName ) { - long lX = rPos.x; - long lY = rPos.y; - long lWidth = rSize.x; - long lHeight = rSize.y; - const char* zDlg; - WXDWORD dwExtendedStyle = 0L; - HWND hWnd; - Init(); - m_pOldFocus = (wxWindow*)FindFocus(); - SetName(rsName); - wxTopLevelWindows.Append(this); - if (pParent) - pParent->AddChild(this); - if (vId == -1) - m_windowId = NewControlId(); - else - m_windowId = vId; - if (lX < 0) - lX = wxDIALOG_DEFAULT_X; - if (lY < 0) - lY = wxDIALOG_DEFAULT_Y; - m_windowStyle = lStyle; - if (lWidth < 0) - lWidth = wxDIALOG_DEFAULT_WIDTH; - if (lHeight < 0) - lHeight = wxDIALOG_DEFAULT_HEIGHT; + SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG); // - // All dialogs should really have this style + // Save focus before doing anything which can potentially change it // - m_windowStyle |= wxTAB_TRAVERSAL; + m_pOldFocus = FindFocus(); // - // Allows creation of dialogs with & without captions under MSWindows, - // resizeable or not (but a resizeable dialog always has caption - - // otherwise it would look too strange) + // All dialogs should really have this style // - if (lStyle & wxRESIZE_BORDER ) - zDlg = "wxResizeableDialog"; - else if (lStyle & wxCAPTION ) - zDlg = "wxCaptionDialog"; - else - zDlg = "wxNoCaptionDialog"; - OS2Create( GetWinHwnd(pParent) - ,NULL - ,rsTitle.c_str() - ,0L - ,lX - ,lY - ,lWidth - ,lHeight - ,GetWinHwnd(pParent) - ,HWND_TOP - ,(long)m_windowId - ,NULL - ,NULL - ); - hWnd = (HWND)GetHWND(); - if (!hWnd) - { + lStyle |= wxTAB_TRAVERSAL; + + if (!wxTopLevelWindow::Create( pParent + ,vId + ,rsTitle + ,rPos + ,rSize + ,lStyle + ,rsName + )) return FALSE; - } - SubclassWin(GetHWND()); - ::WinSetWindowText( hWnd - ,(PSZ)rsTitle.c_str() - ); - SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); + SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); + + // + // Must defer setting the title until after dialog is created and sized + // + if (!rsTitle.IsNull()) + SetTitle(rsTitle); return TRUE; } // end of wxDialog::Create +// deprecated ctor +wxDialog::wxDialog(wxWindow *parent, + const wxString& title, + bool WXUNUSED(modal), + int x, + int y, + int w, + int h, + long style, + const wxString& name) +{ + Init(); + + Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name); +} + void wxDialog::SetModal( - bool bFlag + bool WXUNUSED(bFlag) ) { - if (bFlag) - m_windowStyle |= wxDIALOG_MODAL ; - else if ( m_windowStyle & wxDIALOG_MODAL ) - m_windowStyle -= wxDIALOG_MODAL ; - - wxModelessWindows.DeleteObject(this); - if (!bFlag) - wxModelessWindows.Append(this); + // nothing to do, obsolete method } // end of wxDialog::SetModal wxDialog::~wxDialog() { m_isBeingDeleted = TRUE; - wxTopLevelWindows.DeleteObject(this); - Show(FALSE); - if (!IsModal()) - wxModelessWindows.DeleteObject(this); - - // - // If this is the last top-level window, exit. - // - if (wxTheApp && (wxTopLevelWindows.Number() == 0)) - { - wxTheApp->SetTopWindow(NULL); - if (wxTheApp->GetExitOnFrameDelete()) - { - ::WinPostMsg(GetHwnd(), WM_QUIT, 0, 0); - } - } + // this will also reenable all the other windows for a modal dialog + Show(false); } // end of wxDialog::~wxDialog // @@ -208,206 +196,87 @@ void wxDialog::OnCharHook( rEvent.Skip(); } -void wxDialog::Iconize( - bool WXUNUSED(bIconize) -) -{ -} // end of wxDialog::Iconize - -bool wxDialog::IsIconized() const -{ - return FALSE; -} // end of wxDialog::IsIconized - -void wxDialog::DoSetClientSize( - int nWidth -, int nHeight -) -{ - HWND hWnd = (HWND) GetHWND(); - RECTL vRect; - RECTL vRect2; - - ::WinQueryWindowRect(hWnd, &vRect); - ::WinQueryWindowRect(hWnd, &vRect2); - - LONG lActualWidth = vRect2.xRight - vRect2.xLeft - vRect.xRight + nWidth; - LONG lActualHeight = vRect2.yTop + vRect2.yTop - vRect.yTop + nHeight; - - ::WinSetWindowPos( GetHwnd() - ,HWND_TOP - ,(LONG)vRect2.xLeft - ,(LONG)vRect2.yTop - ,(LONG)lActualWidth - ,(LONG)lActualHeight - ,SWP_SIZE | SWP_MOVE - ); - - wxSizeEvent vEvent( wxSize( lActualWidth - ,lActualHeight - ) - ,m_windowId - ); - - vEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(vEvent); -} // end of wxDialog::DoSetClientSize - -void wxDialog::DoGetPosition( - int* pnX -, int* pnY -) const -{ - RECTL vRect; - - ::WinQueryWindowRect(GetHwnd(), &vRect); - if (pnX) - *pnX = vRect.xLeft; - if (pnY) - *pnY = vRect.yBottom; // OS/2's bottom is windows' top??? -} // end of wxDialog::DoGetPosition - -bool wxDialog::IsModal() const -{ - return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0; -} // end of wxDialog::IsModal +// ---------------------------------------------------------------------------- +// showing the dialogs +// ---------------------------------------------------------------------------- bool wxDialog::IsModalShowing() const { - return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast + return IsModal(); } // end of wxDialog::IsModalShowing -void wxDialog::DoShowModal() -{ - wxWindow* pParent = GetParent(); - wxWindow* pOldFocus = m_pOldFocus; - HWND hWndOldFocus = 0; - - wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") ); - wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") ); - wxModalDialogs.Append(this); - if (pOldFocus) - hWndOldFocus = (HWND)pOldFocus->GetHWND(); - - // - // Remember where the focus was - // - if (!pOldFocus) +wxWindow *wxDialog::FindSuitableParent() const +{ + // first try to use the currently active window + HWND hwndFg = ::WinQueryActiveWindow(HWND_DESKTOP); + wxWindow *parent = hwndFg ? wxFindWinFromHandle((WXHWND)hwndFg) + : NULL; + if ( !parent ) { - pOldFocus = pParent; - if (pParent) - hWndOldFocus = GetHwndOf(pParent); + // next try the main app window + parent = wxTheApp->GetTopWindow(); } - // - // Disable all other app windows - // - wxASSERT_MSG(!m_pWindowDisabler, _T("disabling windows twice?")); - - m_pWindowDisabler = new wxWindowDisabler(this); - - // - // Enter the modal loop - // - while ( IsModalShowing() ) + // finally, check if the parent we found is really suitable + if ( !parent || parent == (wxWindow *)this || !parent->IsShown() ) { -#if wxUSE_THREADS - wxMutexGuiLeaveOrEnter(); -#endif // wxUSE_THREADS - - while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() ) - ; - - // a message came or no more idle processing to do - wxTheApp->DoMessage(); + // don't use this one + parent = NULL; } - // - // Snd restore focus - // Note that this code MUST NOT access the dialog object's data - // in case the object has been deleted (which will be the case - // for a modal dialog that has been destroyed before calling EndModal). - // - if (pOldFocus && (pOldFocus != this) && ::WinIsWindow(vHabmain, hWndOldFocus)) - { - // - // This is likely to prove that the object still exists - // - if (wxFindWinFromHandle((WXHWND) hWndOldFocus) == pOldFocus) - pOldFocus->SetFocus(); - } -} // end of wxDialog::DoShowModal + return parent; +} bool wxDialog::Show( bool bShow ) { - if (!bShow) + if ( bShow == IsShown() ) + return false; + + if (!bShow && m_modalData ) { - // - // If we had disabled other app windows, reenable them back now because + // we need to do this before calling wxDialogBase version because if we + // had disabled other app windows, they must be reenabled right now as // if they stay disabled Windows will activate another window (one - // which is enabled, anyhow) and we will lose activation - // + // which is enabled, anyhow) when we're hidden in the base class Show() + // and we will lose activation + m_modalData->ExitLoop(); +#if 0 if (m_pWindowDisabler) { delete m_pWindowDisabler; m_pWindowDisabler = NULL; } - } - - // - // ShowModal() may be called for already shown dialog - // - if (!wxDialogBase::Show(bShow) && !(bShow && IsModal())) - { - // - // Nothing to do - // - return FALSE; +#endif } if (bShow) { - // - // Usually will result in TransferDataToWindow() being called - // + // this usually will result in TransferDataToWindow() being called + // which will change the controls values so do it before showing as + // otherwise we could have some flicker InitDialog(); } - if (IsModal()) + wxDialogBase::Show(bShow); + + if (GetTitle().c_str()) + ::WinSetWindowText((HWND)GetHwnd(), GetTitle().c_str()); + + if ( bShow ) { - if (bShow) - { - // - // Modal dialog needs a parent window, so try to find one - // - if (!GetParent()) - { - wxWindow* pParent = wxTheApp->GetTopWindow(); - - if ( pParent && pParent != this && pParent->IsShown() ) - { - // - // Use it - // - m_parent = pParent; - - } - } - DoShowModal(); - } - else // end of modal dialog - { - // - // This will cause IsModalShowing() return FALSE and our local - // message loop will terminate - // - wxModalDialogs.DeleteObject(this); - } + // dialogs don't get WM_SIZE message after creation unlike most (all?) + // other windows and so could start their life non laid out correctly + // if we didn't call Layout() from here + // + // NB: normally we should call it just the first time but doing it + // every time is simpler than keeping a flag + Layout(); } - return FALSE; + + return true; } // end of wxDialog::Show // @@ -415,11 +284,67 @@ bool wxDialog::Show( // int wxDialog::ShowModal() { - if (!IsModal()) + wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") ); + + m_endModalCalled = false; + + Show(); + + // EndModal may have been called from InitDialog handler (called from + // inside Show()), which would cause an infinite loop if we didn't take it + // into account + if ( !m_endModalCalled ) { - SetModal(TRUE); + // modal dialog needs a parent window, so try to find one + wxWindow *parent = GetParent(); + if ( !parent ) + { + parent = FindSuitableParent(); + } + + // remember where the focus was + wxWindow *oldFocus = m_pOldFocus; + if ( !oldFocus ) + { + // VZ: do we really want to do this? + oldFocus = parent; + } + + // We have to remember the HWND because we need to check + // the HWND still exists (oldFocus can be garbage when the dialog + // exits, if it has been destroyed) + HWND hwndOldFocus = oldFocus ? GetHwndOf(oldFocus) : NULL; + + + // + // Before entering the modal loop, reset the "is in OnIdle()" flag (see + // comment in app.cpp) + // + extern bool gbInOnIdle; + bool bWasInOnIdle = gbInOnIdle; + + gbInOnIdle = FALSE; + + // enter and run the modal loop + { + wxDialogModalDataTiedPtr modalData(&m_modalData, + new wxDialogModalData(this)); + modalData->RunLoop(); + } + gbInOnIdle = bWasInOnIdle; + + // and restore focus + // Note that this code MUST NOT access the dialog object's data + // in case the object has been deleted (which will be the case + // for a modal dialog that has been destroyed before calling EndModal). + if ( oldFocus && (oldFocus != this) && ::WinIsWindow(vHabmain, hwndOldFocus)) + { + // This is likely to prove that the object still exists + if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus) + oldFocus->SetFocus(); + } } - Show(TRUE); + return GetReturnCode(); } // end of wxDialog::ShowModal @@ -427,10 +352,26 @@ void wxDialog::EndModal( int nRetCode ) { + wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") ); + + m_endModalCalled = true; SetReturnCode(nRetCode); - Show(FALSE); + + Hide(); } // end of wxDialog::EndModal +void wxDialog::EndDialog(int rc) +{ + if ( IsModal() ) + EndModal(rc); + else + Hide(); +} + +// ---------------------------------------------------------------------------- +// wxWin event handlers +// ---------------------------------------------------------------------------- + void wxDialog::OnApply( wxCommandEvent& rEvent ) @@ -446,7 +387,7 @@ void wxDialog::OnOK( { if ( Validate() && TransferDataFromWindow() ) { - EndModal(wxID_OK); + EndDialog(wxID_OK); } } // end of wxDialog::OnOK @@ -454,7 +395,7 @@ void wxDialog::OnCancel( wxCommandEvent& rEvent ) { - EndModal(wxID_CANCEL); + EndDialog(wxID_CANCEL); } // end of wxDialog::OnCancel void wxDialog::OnCloseWindow( @@ -462,8 +403,7 @@ void wxDialog::OnCloseWindow( ) { // - // We'll send a Cancel message by default, - // which may close the dialog. + // We'll send a Cancel message by default, which may close the dialog. // Check for looping if the Cancel event handler calls Close(). // // Note that if a cancel button and handler aren't present in the dialog, @@ -495,22 +435,11 @@ void wxDialog::OnCloseWindow( closing.DeleteObject(this); } // end of wxDialog::OnCloseWindow -// -// Destroy the window (delayed, if a managed window) -// -bool wxDialog::Destroy() -{ - wxCHECK_MSG( !wxPendingDelete.Member(this), FALSE, - _T("wxDialog destroyed twice") ); - wxPendingDelete.Append(this); - return TRUE; -} // end of wxDialog::Destroy - void wxDialog::OnSysColourChanged( wxSysColourChangedEvent& rEvent ) { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); Refresh(); } // end of wxDialog::OnSysColourChanged