X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..952ae1e88b9092f493b4ea6911a2b60b378d422d:/src/os2/dialog.cpp?ds=sidebyside diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp index 7a5fd77c65..eb635379c9 100644 --- a/src/os2/dialog.cpp +++ b/src/os2/dialog.cpp @@ -28,352 +28,351 @@ #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)); -} - -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 - - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); - SetName(name); +#define wxDIALOG_DEFAULT_WIDTH 500 +#define wxDIALOG_DEFAULT_HEIGHT 500 - if (!parent) - wxTopLevelWindows.Append(this); - - if (parent) parent->AddChild(this); - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; +wxWindowList wxModalDialogs; - if (x < 0) x = wxDIALOG_DEFAULT_X; - if (y < 0) y = wxDIALOG_DEFAULT_Y; +IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) - m_windowStyle = style; +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) + EVT_CLOSE(wxDialog::OnCloseWindow) +END_EVENT_TABLE() +void wxDialog::Init() +{ + m_pOldFocus = (wxWindow *)NULL; m_isShown = FALSE; - m_modalShowing = FALSE; - - if (width < 0) - width = 500; - if (height < 0) - height = 500; - - // TODO: convert below to OS/2 PM code - + m_pWindowDisabler = (wxWindowDisabler *)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 +) +{ + 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(); + 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 -void wxDialog::SetModal(bool flag) +void wxDialog::SetModal( + bool bFlag +) { - if ( flag ) + if (bFlag) + { m_windowStyle |= wxDIALOG_MODAL ; - else if ( m_windowStyle & wxDIALOG_MODAL ) - m_windowStyle -= wxDIALOG_MODAL ; - - wxModelessWindows.DeleteObject(this); - if (!flag) - wxModelessWindows.Append(this); -} + wxModelessWindows.DeleteObject(this); + } + else + { + m_windowStyle &= ~wxDIALOG_MODAL ; + wxModelessWindows.Append(this); + } +} // end of wxDialog::SetModal wxDialog::~wxDialog() { m_isBeingDeleted = TRUE; - - wxTopLevelWindows.DeleteObject(this); - Show(FALSE); +} // end of wxDialog::~wxDialog - 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 - } - } -} - +// // 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(); + rEvent.Skip(); } -void wxDialog::OnPaint(wxPaintEvent& event) -{ - // No: if you call the default procedure, it makes - // the following painting code not work. -// wxWindow::OnPaint(event); -} +// ---------------------------------------------------------------------------- +// showing the dialogs +// ---------------------------------------------------------------------------- -void wxDialog::Fit() +bool wxDialog::IsModal() const { - wxWindow::Fit(); -} + return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0; +} // end of wxDialog::IsModal -void wxDialog::Iconize(bool WXUNUSED(iconize)) +bool wxDialog::IsModalShowing() const { - // Windows dialog boxes can't be iconized -} + return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast +} // end of wxDialog::IsModalShowing -bool wxDialog::IsIconized() const +void wxDialog::DoShowModal() { - return FALSE; -} + wxWindow* pParent = GetParent(); + wxWindow* pOldFocus = m_pOldFocus; + HWND hWndOldFocus = 0; -void wxDialog::DoSetClientSize(int width, int height) -{ - // TODO: Convert the below to OS/2 PM code + wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") ); + wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") ); -// 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; + wxModalDialogs.Append(this); + if (pOldFocus) + hWndOldFocus = (HWND)pOldFocus->GetHWND(); -// 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); + // + // Remember where the focus was + // + if (!pOldFocus) + { + pOldFocus = pParent; + if (pParent) + hWndOldFocus = GetHwndOf(pParent); + } -// *x = rect.left; -// *y = rect.top; -} + // + // Disable all other app windows + // + wxASSERT_MSG(!m_pWindowDisabler, _T("disabling windows twice?")); + + // + // Disables other app windows and window proc message processing + // until WinDismissDlg called + // + ::WinProcessDlg((HWND)GetHwnd()); + + // + // Enter the modal loop + // + while ( IsModalShowing() ) + { +#if wxUSE_THREADS + wxMutexGuiLeaveOrEnter(); +#endif // wxUSE_THREADS -bool wxDialog::IsShown() const -{ - return m_isShown; -} + while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() ) + ; -bool wxDialog::IsModal() const -{ - return wxModalDialogs.Find((wxDialog *)this) != 0; // const_cast -} + // a message came or no more idle processing to do + wxTheApp->DoMessage(); + } -bool wxDialog::Show(bool show) -{ - // TODO: This is involved code, look at msw port for details - return FALSE; -} + // + // 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 -void wxDialog::SetTitle(const wxString& title) +bool wxDialog::Show( + bool bShow +) { - ::WinSetWindowText((HWND) GetHWND(), title.c_str()); -} + if (!bShow) + { + // + // If we had disabled other app windows, reenable them back now because + // if they stay disabled Windows will activate another window (one + // which is enabled, anyhow) and we will lose activation. We really don't + // do this in OS/2 since PM does this for us. + // + if (m_pWindowDisabler) + { + delete m_pWindowDisabler; + m_pWindowDisabler = NULL; + } + } -wxString wxDialog::GetTitle() const -{ - ::WinQueryWindowText((HWND) GetHWND(), 1000, wxBuffer); - return wxString(wxBuffer); -} + // + // ShowModal() may be called for already shown dialog + // + if (!wxDialogBase::Show(bShow) && !(bShow && IsModal())) + { + // + // Nothing to do + // + return FALSE; + } -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) + { + // + // Usually will result in TransferDataToWindow() being called + // + InitDialog(); + } + if (GetTitle().c_str()) + ::WinSetWindowText((HWND)GetHwnd(), GetTitle().c_str()); + if (IsModal()) + { + 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); + } + } + return TRUE; +} // end of wxDialog::Show + +// // Replacement for Show(TRUE) for modal dialogs - returns return code +// int wxDialog::ShowModal() { - m_windowStyle |= wxDIALOG_MODAL; + if (!IsModal()) + { + SetModal(TRUE); + } Show(TRUE); return GetReturnCode(); -} +} // end of wxDialog::ShowModal -void wxDialog::EndModal(int retCode) +void wxDialog::EndModal( + int nRetCode +) { - SetReturnCode(retCode); - // TODO modal un-showing + SetReturnCode(nRetCode); Show(FALSE); -} + ::WinDismissDlg((HWND)GetHwnd(), nRetCode); +} // end of wxDialog::EndModal -// 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() ) - { - if ( IsModal() ) - EndModal(wxID_OK); - else - { - SetReturnCode(wxID_OK); - this->Show(FALSE); - } - } -} +// ---------------------------------------------------------------------------- +// wxWin event handlers +// ---------------------------------------------------------------------------- -void wxDialog::OnApply(wxCommandEvent& event) +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); + EndModal(wxID_OK); } -} +} // end of wxDialog::OnOK + +void wxDialog::OnCancel( + wxCommandEvent& rEvent +) +{ + EndModal(wxID_CANCEL); +} // end of wxDialog::OnCancel -void wxDialog::OnCloseWindow(wxCloseEvent& event) +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 +382,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 +394,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(HWND hwnd, 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(hwnd, message, wParam, lParam); - + if (!bProcessed) + rc = wxWindow::OS2WindowProc( uMessage + ,wParam + ,lParam + ); return rc; -} +} // end of wxDialog::OS2WindowProc