X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a885d89ae9c9d6ff5275cb5b1ea3087132aacf8c..4b5e178a4c22caac92952131632641c63821fc0c:/src/os2/dialog.cpp?ds=sidebyside diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp index 874a9c90a2..abb905f2f8 100644 --- a/src/os2/dialog.cpp +++ b/src/os2/dialog.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dialog.cpp +// Name: src/os2/dialog.cpp // Purpose: wxDialog class // Author: David Webster // Modified by: @@ -12,434 +12,336 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifndef WX_PRECOMP #include "wx/dialog.h" -#include "wx/utils.h" -#include "wx/frame.h" -#include "wx/app.h" -#include "wx/settings.h" -#include "wx/intl.h" -#include "wx/log.h" + +#ifndef WX_PRECOMP + #include "wx/utils.h" + #include "wx/frame.h" + #include "wx/app.h" + #include "wx/settings.h" + #include "wx/intl.h" + #include "wx/log.h" #endif #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; - - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); -} +#define wxDIALOG_DEFAULT_WIDTH 500 +#define wxDIALOG_DEFAULT_HEIGHT 500 -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 +IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); - SetName(name); +// ---------------------------------------------------------------------------- +// wxDialogModalData +// ---------------------------------------------------------------------------- - if (!parent) - wxTopLevelWindows.Append(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 (parent) parent->AddChild(this); + void RunLoop() + { + m_evtLoop.Run(); + } - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; + void ExitLoop() + { + m_evtLoop.Exit(); + } - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; +private: + wxModalEventLoop m_evtLoop; +}; - if (x < 0) x = wxDIALOG_DEFAULT_X; - if (y < 0) y = wxDIALOG_DEFAULT_Y; +wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData); - m_windowStyle = style; +// ============================================================================ +// implementation +// ============================================================================ - m_isShown = FALSE; - m_modalShowing = FALSE; +// ---------------------------------------------------------------------------- +// wxDialog construction +// ---------------------------------------------------------------------------- - if (width < 0) - width = 500; - if (height < 0) - height = 500; +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); - // TODO: convert below to OS/2 PM code + // + // 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)); -// - return TRUE; + // + 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 + +#if WXWIN_COMPATIBILITY_2_6 + +// 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 + +#endif // WXWIN_COMPATIBILITY_2_6 wxDialog::~wxDialog() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; - wxTopLevelWindows.DeleteObject(this); + // this will also reenable all the other windows for a modal dialog + Show(false); +} // end of wxDialog::~wxDialog - Show(FALSE); +// ---------------------------------------------------------------------------- +// showing the dialogs +// ---------------------------------------------------------------------------- - if (m_modalShowing) - { - if (GetParent() && GetParent()->GetHWND()) - // TODO: bring the parent to the top - return; - } +#if WXWIN_COMPATIBILITY_2_6 - m_modalShowing = FALSE; - if ( (GetWindowStyleFlag() & wxDIALOG_MODAL) != wxDIALOG_MODAL ) - wxModelessWindows.DeleteObject(this); +bool wxDialog::IsModalShowing() const +{ + return IsModal(); +} // end of wxDialog::IsModalShowing +#endif // WXWIN_COMPATIBILITY_2_6 - // If this is the last top-level window, exit. - if (wxTheApp && (wxTopLevelWindows.Number() == 0)) +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 ) { - wxTheApp->SetTopWindow(NULL); + // next try the main app window + parent = wxTheApp->GetTopWindow(); + } - if (wxTheApp->GetExitOnFrameDelete()) - { - // TODO: exit - } + // finally, check if the parent we found is really suitable + if ( !parent || parent == (wxWindow *)this || !parent->IsShown() ) + { + // don't use this one + parent = NULL; } + + return parent; } -// By default, pressing escape cancels the dialog -void wxDialog::OnCharHook(wxKeyEvent& event) +bool wxDialog::Show( bool bShow ) { - if (GetHWND()) + if ( bShow == IsShown() ) + return false; + + if (!bShow && m_modalData ) { - if (event.m_keyCode == WXK_ESCAPE) + // 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) { - // 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); - - return; + delete m_pWindowDisabler; + m_pWindowDisabler = NULL; } +#endif } - // 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); -} + if (bShow) + { + if (CanDoLayoutAdaptation()) + DoLayoutAdaptation(); -void wxDialog::Fit() -{ - wxWindow::Fit(); -} + // 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::Iconize(bool WXUNUSED(iconize)) -{ - // Windows dialog boxes can't be iconized -} + wxDialogBase::Show(bShow); -bool wxDialog::IsIconized() const -{ - return FALSE; -} + wxString title = GetTitle(); + if (!title.empty()) + ::WinSetWindowText((HWND)GetHwnd(), title.c_str()); -void wxDialog::DoSetClientSize(int width, int height) -{ - // TODO: Convert the below to OS/2 PM code + if ( bShow ) + { + // dialogs don't get WM_SIZE message after creation unlike most (all?) + // other windows and so could start their life not 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(); + } -// 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; + return true; +} // end of wxDialog::Show -// 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); - -// *x = rect.left; -// *y = rect.top; -} - -bool wxDialog::IsShown() const -{ - return m_isShown; -} - -bool wxDialog::IsModal() const -{ - return wxModalDialogs.Find((wxDialog *)this) != 0; // const_cast -} - -bool wxDialog::Show(bool show) -{ - // TODO: This is involved code, look at msw port for details - return FALSE; -} - -void wxDialog::SetTitle(const wxString& title) -{ - ::WinSetWindowText((HWND) GetHWND(), title.c_str()); -} - -wxString wxDialog::GetTitle() const -{ - ::WinQueryWindowText((HWND) GetHWND(), 1000, wxBuffer); - return wxString(wxBuffer); -} - -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); -} - -// Replacement for Show(TRUE) for modal dialogs - returns return code +// 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 ) { - SetReturnCode(wxID_OK); - this->Show(FALSE); + parent = FindSuitableParent(); } - } -} - -void wxDialog::OnApply(wxCommandEvent& event) -{ - if (Validate()) - TransferDataFromWindow(); - // TODO probably need to disable the Apply button until things change again -} -void wxDialog::OnCancel(wxCommandEvent& event) -{ - if ( IsModal() ) - EndModal(wxID_CANCEL); - else - { - SetReturnCode(wxID_CANCEL); - this->Show(FALSE); - } -} + // remember where the focus was + wxWindow *oldFocus = m_pOldFocus; + if ( !oldFocus ) + { + // VZ: do we really want to do this? + oldFocus = parent; + } -void wxDialog::OnCloseWindow(wxCloseEvent& event) -{ - // We'll send a Cancel message by default, - // which may close the dialog. - // Check for looping if the Cancel event handler calls Close(). + // 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; - // 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(). - // We wouldn't want to destroy the dialog by default, since the dialog may have been - // created on the stack. - // However, this does mean that calling dialog->Close() won't delete the dialog - // 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. - static wxList closing; + // + // Before entering the modal loop, reset the "is in OnIdle()" flag (see + // comment in app.cpp) + // + extern bool gbInOnIdle; + bool bWasInOnIdle = gbInOnIdle; - if ( closing.Member(this) ) - return; + gbInOnIdle = false; - closing.Append(this); + // enter and run the modal loop + { + wxDialogModalDataTiedPtr modalData(&m_modalData, + new wxDialogModalData(this)); + modalData->RunLoop(); + } + gbInOnIdle = bWasInOnIdle; - wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - cancelEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog + // 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(); + } + } - closing.DeleteObject(this); -} + return GetReturnCode(); +} // end of wxDialog::ShowModal -// Destroy the window (delayed, if a managed window) -bool wxDialog::Destroy() +void wxDialog::EndModal( + int nRetCode +) { - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); - return TRUE; -} + wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") ); -void wxDialog::OnSize(wxSizeEvent& WXUNUSED(event)) -{ - // if we're using constraints - do use them - #if wxUSE_CONSTRAINTS - if ( GetAutoLayout() ) - { - Layout(); - } - #endif -} + m_endModalCalled = true; + SetReturnCode(nRetCode); -void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event) -{ - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); - Refresh(); -} + Hide(); +} // end of wxDialog::EndModal -MRESULT wxDialog::OS2WindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +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