X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a885d89ae9c9d6ff5275cb5b1ea3087132aacf8c..8add533eb22ba0756f5b426f77ee593bc1aa6fcd:/src/os2/dialog.cpp diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp index 874a9c90a2..820367c6d4 100644 --- a/src/os2/dialog.cpp +++ b/src/os2/dialog.cpp @@ -24,356 +24,388 @@ #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 -// 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, wxPanel) - - 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() - -wxDialog::wxDialog() -{ - m_isShown = FALSE; - m_modalShowing = FALSE; +#define wxDIALOG_DEFAULT_WIDTH 500 +#define wxDIALOG_DEFAULT_HEIGHT 500 - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); -} +IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) -bool wxDialog::Create(wxWindow *parent, wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ -#if wxUSE_TOOLTIPS - m_hwndToolTip = 0; -#endif +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) - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); - SetName(name); + EVT_CLOSE(wxDialog::OnCloseWindow) +END_EVENT_TABLE() - if (!parent) - wxTopLevelWindows.Append(this); +// ---------------------------------------------------------------------------- +// wxDialogModalData +// ---------------------------------------------------------------------------- - if (parent) parent->AddChild(this); +// 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) { } - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; + void RunLoop() + { + m_evtLoop.Run(); + } - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; + void ExitLoop() + { + m_evtLoop.Exit(); + } - if (x < 0) x = wxDIALOG_DEFAULT_X; - if (y < 0) y = wxDIALOG_DEFAULT_Y; +private: + wxModalEventLoop m_evtLoop; +}; - m_windowStyle = style; +wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData); - m_isShown = FALSE; - m_modalShowing = FALSE; +// ============================================================================ +// implementation +// ============================================================================ - if (width < 0) - width = 500; - if (height < 0) - height = 500; +// ---------------------------------------------------------------------------- +// wxDialog construction +// ---------------------------------------------------------------------------- - // TODO: convert below to OS/2 PM code +void wxDialog::Init() +{ + m_pOldFocus = (wxWindow *)NULL; + m_isShown = FALSE; + m_pWindowDisabler = (wxWindowDisabler *)NULL; + m_modalData = NULL; + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); +} // end of wxDialog::Init + +bool wxDialog::Create( + wxWindow* pParent +, wxWindowID vId +, const wxString& rsTitle +, const wxPoint& rPos +, const wxSize& rSize +, long lStyle +, const wxString& rsName +) +{ + Init(); + SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG); + + // + // Save focus before doing anything which can potentially change it + // + m_pOldFocus = FindFocus(); + // // All dialogs should really have this style -// m_windowStyle |= wxTAB_TRAVERSAL; -// -// WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle); -// if (m_windowStyle & wxSTAY_ON_TOP) -// extendedStyle |= WS_EX_TOPMOST; -// - // 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) -// const wxChar *dlg; -// if ( style & wxRESIZE_BORDER ) -// dlg = wxT("wxResizeableDialog"); -// else if ( style & wxCAPTION ) -// dlg = wxT("wxCaptionDialog"); -// else -// dlg = wxT("wxNoCaptionDialog"); -// MSWCreate(m_windowId, parent, NULL, this, NULL, -// x, y, width, height, -// 0, // style is not used if we have dlg template -// dlg, -// extendedStyle); -// -// HWND hwnd = (HWND)GetHWND(); -// -// if ( !hwnd ) -// { -// wxLogError(wxT("Failed to create dialog.")); -// -// return FALSE; -// } -// -// SubclassWin(GetHWND()); -// -// SetWindowText(hwnd, title); -// SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); -// + // + lStyle |= wxTAB_TRAVERSAL; + + if (!wxTopLevelWindow::Create( pParent + ,vId + ,rsTitle + ,rPos + ,rSize + ,lStyle + ,rsName + )) + return FALSE; + 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 flag) +void wxDialog::SetModal( + bool WXUNUSED(bFlag) +) { - if ( flag ) - m_windowStyle |= wxDIALOG_MODAL ; - else if ( m_windowStyle & wxDIALOG_MODAL ) - m_windowStyle -= wxDIALOG_MODAL ; - - wxModelessWindows.DeleteObject(this); - if (!flag) - wxModelessWindows.Append(this); -} + // nothing to do, obsolete method +} // end of wxDialog::SetModal wxDialog::~wxDialog() { m_isBeingDeleted = TRUE; - wxTopLevelWindows.DeleteObject(this); - - Show(FALSE); - - if (m_modalShowing) - { - if (GetParent() && GetParent()->GetHWND()) - // TODO: bring the parent to the top - return; - } - - m_modalShowing = FALSE; - if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL ) - wxModelessWindows.DeleteObject(this); - - - // If this is the last top-level window, exit. - if (wxTheApp && (wxTopLevelWindows.Number() == 0)) - { - wxTheApp->SetTopWindow(NULL); - - if (wxTheApp->GetExitOnFrameDelete()) - { - // TODO: exit - } - } -} + // this will also reenable all the other windows for a modal dialog + Show(false); +} // end of wxDialog::~wxDialog +// // By default, pressing escape cancels the dialog -void wxDialog::OnCharHook(wxKeyEvent& event) +// +void wxDialog::OnCharHook( + wxKeyEvent& rEvent +) { if (GetHWND()) { - if (event.m_keyCode == WXK_ESCAPE) + if (rEvent.m_keyCode == WXK_ESCAPE) { + // // 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); - + // + wxCommandEvent vCancelEvent( wxEVT_COMMAND_BUTTON_CLICKED + ,wxID_CANCEL + ); + + vCancelEvent.SetEventObject( this ); + GetEventHandler()->ProcessEvent(vCancelEvent); + + // + // Ensure that there is another message for this window so the + // ShowModal loop will exit and won't get stuck in GetMessage(). + // + ::WinPostMsg(GetHwnd(), WM_NULL, 0, 0); return; } } // We didn't process this event. - event.Skip(); -} - -void wxDialog::OnPaint(wxPaintEvent& event) -{ - // No: if you call the default procedure, it makes - // the following painting code not work. -// wxWindow::OnPaint(event); + rEvent.Skip(); } -void wxDialog::Fit() -{ - wxWindow::Fit(); -} +// ---------------------------------------------------------------------------- +// showing the dialogs +// ---------------------------------------------------------------------------- -void wxDialog::Iconize(bool WXUNUSED(iconize)) +bool wxDialog::IsModalShowing() const { - // Windows dialog boxes can't be iconized -} + return IsModal(); +} // end of wxDialog::IsModalShowing -bool wxDialog::IsIconized() const -{ - return FALSE; -} -void wxDialog::DoSetClientSize(int width, int height) +wxWindow *wxDialog::FindSuitableParent() const { - // TODO: Convert the below to OS/2 PM code - -// HWND hWnd = (HWND) GetHWND(); -// RECT rect; -// ::GetClientRect(hWnd, &rect); -// -// RECT rect2; -// GetWindowRect(hWnd, &rect2); -// - // Find the difference between the entire window (title bar and all) - // and the client area; add this to the new client size to move the - // window -// int actual_width = rect2.right - rect2.left - rect.right + width; -// int actual_height = rect2.bottom - rect2.top - rect.bottom + height; + // first try to use the currently active window + HWND hwndFg = ::WinQueryActiveWindow(HWND_DESKTOP); + wxWindow *parent = hwndFg ? wxFindWinFromHandle((WXHWND)hwndFg) + : NULL; + if ( !parent ) + { + // next try the main app window + parent = wxTheApp->GetTopWindow(); + } -// MoveWindow(hWnd, rect2.left, rect2.top, actual_width, actual_height, TRUE); -// -// wxSizeEvent event(wxSize(actual_width, actual_height), m_windowId); -// event.SetEventObject( this ); -// GetEventHandler()->ProcessEvent(event); -} -void wxDialog::GetPosition(int *x, int *y) const -{ - // TODO: Convert -// HWND hWnd = (HWND) GetHWND(); -// RECT rect; -// GetWindowRect(hWnd, &rect); + // finally, check if the parent we found is really suitable + if ( !parent || parent == (wxWindow *)this || !parent->IsShown() ) + { + // don't use this one + parent = NULL; + } -// *x = rect.left; -// *y = rect.top; + return parent; } -bool wxDialog::IsShown() const +bool wxDialog::Show( + bool bShow +) { - return m_isShown; -} + if ( bShow == IsShown() ) + return false; -bool wxDialog::IsModal() const -{ - return wxModalDialogs.Find((wxDialog *)this) != 0; // const_cast -} + if (!bShow && m_modalData ) + { + // 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) 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; + } +#endif + } -bool wxDialog::Show(bool show) -{ - // TODO: This is involved code, look at msw port for details - return FALSE; -} + if (bShow) + { + // 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(); + } -void wxDialog::SetTitle(const wxString& title) -{ - ::WinSetWindowText((HWND) GetHWND(), title.c_str()); -} + wxDialogBase::Show(bShow); -wxString wxDialog::GetTitle() const -{ - ::WinQueryWindowText((HWND) GetHWND(), 1000, wxBuffer); - return wxString(wxBuffer); -} + if (GetTitle().c_str()) + ::WinSetWindowText((HWND)GetHwnd(), GetTitle().c_str()); -void wxDialog::Centre(int direction) -{ - int x_offset,y_offset ; - int display_width, display_height; - int width, height, x, y; - wxWindow *parent = GetParent(); - if ((direction & wxCENTER_FRAME) && parent) - { - parent->GetPosition(&x_offset,&y_offset) ; - parent->GetSize(&display_width,&display_height) ; - } - else - { - wxDisplaySize(&display_width, &display_height); - x_offset = 0 ; - y_offset = 0 ; - } - - GetSize(&width, &height); - GetPosition(&x, &y); - - if (direction & wxHORIZONTAL) - x = (int)((display_width - width)/2); - if (direction & wxVERTICAL) - y = (int)((display_height - height)/2); - - SetSize(x+x_offset, y+y_offset, width, height); -} + if ( bShow ) + { + // 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 true; +} // end of wxDialog::Show + +// // Replacement for Show(TRUE) for modal dialogs - returns return code +// int wxDialog::ShowModal() { - m_windowStyle |= wxDIALOG_MODAL; - Show(TRUE); - return GetReturnCode(); -} + wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") ); -void wxDialog::EndModal(int retCode) -{ - SetReturnCode(retCode); - // TODO modal un-showing - Show(FALSE); -} + m_endModalCalled = false; -// Define for each class of dialog and control -WXHBRUSH wxDialog::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam) -{ - return 0; -} -// Standard buttons -void wxDialog::OnOK(wxCommandEvent& event) -{ - if ( Validate() && TransferDataFromWindow() ) + 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 ) { - if ( IsModal() ) - EndModal(wxID_OK); - else + // 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)) { - SetReturnCode(wxID_OK); - this->Show(FALSE); + // This is likely to prove that the object still exists + if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus) + oldFocus->SetFocus(); } } + + return GetReturnCode(); +} // end of wxDialog::ShowModal + +void wxDialog::EndModal( + int nRetCode +) +{ + wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") ); + + m_endModalCalled = true; + SetReturnCode(nRetCode); + + Hide(); +} // end of wxDialog::EndModal + +void wxDialog::EndDialog(int rc) +{ + if ( IsModal() ) + EndModal(rc); + else + Hide(); } -void wxDialog::OnApply(wxCommandEvent& event) +// ---------------------------------------------------------------------------- +// wxWin event handlers +// ---------------------------------------------------------------------------- + +void wxDialog::OnApply( + wxCommandEvent& rEvent +) { if (Validate()) TransferDataFromWindow(); - // TODO probably need to disable the Apply button until things change again -} +} // end of wxDialog::OnApply -void wxDialog::OnCancel(wxCommandEvent& event) +// Standard buttons +void wxDialog::OnOK( + wxCommandEvent& rEvent +) { - if ( IsModal() ) - EndModal(wxID_CANCEL); - else + if ( Validate() && TransferDataFromWindow() ) { - SetReturnCode(wxID_CANCEL); - this->Show(FALSE); + EndDialog(wxID_OK); } -} +} // end of wxDialog::OnOK -void wxDialog::OnCloseWindow(wxCloseEvent& event) +void wxDialog::OnCancel( + wxCommandEvent& rEvent +) { - // We'll send a Cancel message by default, - // which may close the dialog. - // Check for looping if the Cancel event handler calls Close(). + EndDialog(wxID_CANCEL); +} // end of wxDialog::OnCancel +void wxDialog::OnCloseWindow( + wxCloseEvent& rEvent +) +{ + // + // 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, // nothing will happen when you close the dialog via the window manager, or // via Close(). @@ -383,7 +415,11 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event) // unless the handler for wxID_CANCEL does so. So use Destroy() if you want to be // sure to destroy the dialog. // The default OnCancel (above) simply ends a modal dialog, and hides a modeless dialog. + // + // + // Ugh??? This is not good but until I figure out a global list it'll have to do + // static wxList closing; if ( closing.Member(this) ) @@ -391,55 +427,47 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event) closing.Append(this); - wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - cancelEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog + wxCommandEvent vCancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - closing.DeleteObject(this); -} + vCancelEvent.SetEventObject( this ); + GetEventHandler()->ProcessEvent(vCancelEvent); // This may close the dialog -// Destroy the window (delayed, if a managed window) -bool wxDialog::Destroy() -{ - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); - return TRUE; -} - -void wxDialog::OnSize(wxSizeEvent& WXUNUSED(event)) -{ - // if we're using constraints - do use them - #if wxUSE_CONSTRAINTS - if ( GetAutoLayout() ) - { - Layout(); - } - #endif -} + closing.DeleteObject(this); +} // end of wxDialog::OnCloseWindow -void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event) +void wxDialog::OnSysColourChanged( + wxSysColourChangedEvent& rEvent +) { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); - Refresh(); -} - -MRESULT wxDialog::OS2WindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); + Refresh(); +} // end of wxDialog::OnSysColourChanged + +MRESULT wxDialog::OS2WindowProc( + WXUINT uMessage +, WXWPARAM wParam +, WXLPARAM lParam +) { - MRESULT rc = 0; - bool processed = FALSE; + MRESULT rc = 0; + bool bProcessed = FALSE; - switch ( message ) + switch (uMessage) { case WM_CLOSE: - // if we can't close, tell the system that we processed the + // + // If we can't close, tell the system that we processed the // message - otherwise it would close us - processed = !Close(); + // + bProcessed = !Close(); break; } - if ( !processed ) - rc = wxWindow::OS2WindowProc(message, wParam, lParam); - + if (!bProcessed) + rc = wxWindow::OS2WindowProc( uMessage + ,wParam + ,lParam + ); return rc; -} +} // end of wxDialog::OS2WindowProc