X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4db172a3b318df9aff178eb6c5da149d56e0859..fb8d7eb7a880f1f2e32d8830f9c5e12b2536e05f:/src/os2/dialog.cpp diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp index 99e6b11d2c..c6520d9698 100644 --- a/src/os2/dialog.cpp +++ b/src/os2/dialog.cpp @@ -25,7 +25,8 @@ #include "wx/os2/private.h" #include "wx/evtloop.h" -#include "wx/ptr_scpd.h" +#include "wx/scopedptr.h" +#include "wx/modalhook.h" #define wxDIALOG_DEFAULT_X 300 #define wxDIALOG_DEFAULT_Y 300 @@ -33,17 +34,6 @@ #define wxDIALOG_DEFAULT_WIDTH 500 #define wxDIALOG_DEFAULT_HEIGHT 500 -IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) - -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() // ---------------------------------------------------------------------------- // wxDialogModalData @@ -82,9 +72,9 @@ wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData); void wxDialog::Init() { - m_pOldFocus = (wxWindow *)NULL; + m_pOldFocus = NULL; m_isShown = false; - m_pWindowDisabler = (wxWindowDisabler *)NULL; + m_pWindowDisabler = NULL; m_modalData = NULL; SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); } // end of wxDialog::Init @@ -125,7 +115,7 @@ bool wxDialog::Create( wxWindow* pParent, // // Must defer setting the title until after dialog is created and sized // - if (!rsTitle.IsNull()) + if ( !rsTitle.empty() ) SetTitle(rsTitle); return true; } // end of wxDialog::Create @@ -157,46 +147,12 @@ void wxDialog::SetModal(bool WXUNUSED(bFlag)) wxDialog::~wxDialog() { - m_isBeingDeleted = true; + SendDestroyEvent(); // 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& rEvent -) -{ - if (GetHWND()) - { - if (rEvent.m_keyCode == WXK_ESCAPE) - { - // - // Behaviour changed in 2.0: we'll send a Cancel message - // to the dialog instead of Close. - // - 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. - rEvent.Skip(); -} - // ---------------------------------------------------------------------------- // showing the dialogs // ---------------------------------------------------------------------------- @@ -210,28 +166,6 @@ bool wxDialog::IsModalShowing() const #endif // WXWIN_COMPATIBILITY_2_6 -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 ) - { - // next try the main app window - parent = wxTheApp->GetTopWindow(); - } - - // 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; -} - bool wxDialog::Show( bool bShow ) { if ( bShow == IsShown() ) @@ -246,16 +180,15 @@ bool wxDialog::Show( bool bShow ) // and we will lose activation m_modalData->ExitLoop(); #if 0 - if (m_pWindowDisabler) - { - delete m_pWindowDisabler; - m_pWindowDisabler = NULL; - } + wxDELETE(m_pWindowDisabler); #endif } if (bShow) { + if (CanDoLayoutAdaptation()) + DoLayoutAdaptation(); + // 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 @@ -266,7 +199,7 @@ bool wxDialog::Show( bool bShow ) wxString title = GetTitle(); if (!title.empty()) - ::WinSetWindowText((HWND)GetHwnd(), (PSZ)title.c_str()); + ::WinSetWindowText((HWND)GetHwnd(), title.c_str()); if ( bShow ) { @@ -287,7 +220,9 @@ bool wxDialog::Show( bool bShow ) // int wxDialog::ShowModal() { - wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") ); + WX_HOOK_MODAL_DIALOG(); + + wxASSERT_MSG( !IsModal(), wxT("wxDialog::ShowModal() reentered?") ); m_endModalCalled = false; @@ -299,11 +234,7 @@ int wxDialog::ShowModal() if ( !m_endModalCalled ) { // modal dialog needs a parent window, so try to find one - wxWindow *parent = GetParent(); - if ( !parent ) - { - parent = FindSuitableParent(); - } + wxWindow * const parent = GetParentForModalDialog(); // remember where the focus was wxWindow *oldFocus = m_pOldFocus; @@ -355,7 +286,7 @@ void wxDialog::EndModal( int nRetCode ) { - wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") ); + wxASSERT_MSG( IsModal(), wxT("EndModal() called for non modal dialog") ); m_endModalCalled = true; SetReturnCode(nRetCode); @@ -363,79 +294,6 @@ void wxDialog::EndModal( Hide(); } // end of wxDialog::EndModal -void wxDialog::EndDialog(int rc) -{ - if ( IsModal() ) - EndModal(rc); - else - Hide(); -} - -// ---------------------------------------------------------------------------- -// wxWin event handlers -// ---------------------------------------------------------------------------- - -void wxDialog::OnApply( wxCommandEvent& WXUNUSED(rEvent) ) -{ - if (Validate()) - TransferDataFromWindow(); -} // end of wxDialog::OnApply - -// Standard buttons -void wxDialog::OnOK( wxCommandEvent& WXUNUSED(rEvent) ) -{ - if ( Validate() && TransferDataFromWindow() ) - { - EndDialog(wxID_OK); - } -} // end of wxDialog::OnOK - -void wxDialog::OnCancel( wxCommandEvent& WXUNUSED(rEvent) ) -{ - EndDialog(wxID_CANCEL); -} // end of wxDialog::OnCancel - -void wxDialog::OnCloseWindow( wxCloseEvent& WXUNUSED(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(). - // 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. - // - - // - // 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) ) - return; - - closing.Append(this); - - wxCommandEvent vCancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - - vCancelEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(vCancelEvent); // This may close the dialog - - closing.DeleteObject(this); -} // end of wxDialog::OnCloseWindow - -void wxDialog::OnSysColourChanged( wxSysColourChangedEvent& WXUNUSED(rEvent) ) -{ - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); - Refresh(); -} // end of wxDialog::OnSysColourChanged - MRESULT wxDialog::OS2WindowProc( WXUINT uMessage, WXWPARAM wParam, WXLPARAM lParam ) { MRESULT rc = 0;