X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76fae052f14db3c4c8a3d233fce0074ab25d4789..125c798467477966f89eb6ebb4ec2370e754dba3:/src/msw/dialog.cpp diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index 727670f33e..f43c35fe3f 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -40,30 +40,13 @@ #include "wx/msw/private.h" #include "wx/log.h" +#include "wx/evtloop.h" +#include "wx/ptr_scpd.h" #if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__) #include #endif -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// default dialog pos and size - -#define wxDIALOG_DEFAULT_X 300 -#define wxDIALOG_DEFAULT_Y 300 - -#define wxDIALOG_DEFAULT_WIDTH 500 -#define wxDIALOG_DEFAULT_HEIGHT 500 - -// ---------------------------------------------------------------------------- -// globals -// ---------------------------------------------------------------------------- - -// all modal dialogs currently shown -static wxWindowList wxModalDialogs; - // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- @@ -130,13 +113,38 @@ BEGIN_EVENT_TABLE(wxDialog, wxDialogBase) 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 +// ---------------------------------------------------------------------------- + +// 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 // ============================================================================ @@ -148,12 +156,9 @@ END_EVENT_TABLE() void wxDialog::Init() { m_oldFocus = (wxWindow *)NULL; - m_isShown = FALSE; - - m_windowDisabler = (wxWindowDisabler *)NULL; - - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); + m_modalData = NULL; + m_endModalCalled = FALSE; } bool wxDialog::Create(wxWindow *parent, @@ -164,8 +169,6 @@ bool wxDialog::Create(wxWindow *parent, long style, const wxString& name) { - Init(); - SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG); // save focus before doing anything which can potentially change it @@ -177,7 +180,10 @@ bool wxDialog::Create(wxWindow *parent, if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) return FALSE; - SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); + if ( !m_hasFont ) + SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); + + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); return TRUE; } @@ -206,35 +212,6 @@ wxDialog::~wxDialog() Show(FALSE); } -// ---------------------------------------------------------------------------- -// kbd handling -// ---------------------------------------------------------------------------- - -// By default, pressing escape cancels the dialog -void wxDialog::OnCharHook(wxKeyEvent& event) -{ - if (GetHWND()) - { - // "Esc" works as an accelerator for the "Cancel" button, but it - // shouldn't close the dialog which doesn't have any cancel button - if ( (event.m_keyCode == WXK_ESCAPE) && FindWindow(wxID_CANCEL) ) - { - wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); - cancelEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(cancelEvent); - - // ensure that there is another message for this window so the - // ShowModal loop will exit and won't get stuck in GetMessage(). - ::PostMessage(GetHwnd(), WM_NULL, 0, 0); - - return; - } - } - - // We didn't process this event. - event.Skip(); -} - // ---------------------------------------------------------------------------- // showing the dialogs // ---------------------------------------------------------------------------- @@ -246,7 +223,7 @@ bool wxDialog::IsModal() const bool wxDialog::IsModalShowing() const { - return !!wxModalDialogs.Find(wxConstCast(this, wxDialog)); + return m_modalData != NULL; } wxWindow *wxDialog::FindSuitableParent() const @@ -276,8 +253,6 @@ void wxDialog::DoShowModal() wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") ); wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") ); - wxModalDialogs.Append(this); - wxWindow *parent = GetParent(); wxWindow* oldFocus = m_oldFocus; @@ -297,33 +272,13 @@ void wxDialog::DoShowModal() hwndOldFocus = GetHwndOf(parent); } - // disable all other app windows - wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") ); - - m_windowDisabler = new wxWindowDisabler(this); - - // before entering the modal loop, reset the "is in OnIdle()" flag (see - // comment in app.cpp) - extern bool wxIsInOnIdleFlag; - bool wasInOnIdle = wxIsInOnIdleFlag; - wxIsInOnIdleFlag = FALSE; - // enter the modal loop - while ( IsModalShowing() ) { -#if wxUSE_THREADS - wxMutexGuiLeaveOrEnter(); -#endif // wxUSE_THREADS - - while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() ) - ; - - // a message came or no more idle processing to do - wxTheApp->DoMessage(); + wxDialogModalDataTiedPtr modalData(&m_modalData, + new wxDialogModalData(this)); + modalData->RunLoop(); } - wxIsInOnIdleFlag = wasInOnIdle; - // 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 @@ -338,16 +293,14 @@ void wxDialog::DoShowModal() bool wxDialog::Show(bool show) { - if ( !show ) + if ( !show && 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 - if ( m_windowDisabler ) - { - delete m_windowDisabler; - m_windowDisabler = NULL; - } + // which is enabled, anyhow) when we're hidden in the base class Show() + // and we will lose activation + m_modalData->ExitLoop(); } // ShowModal() may be called for already shown dialog @@ -367,32 +320,22 @@ bool wxDialog::Show(bool show) // every time is simpler than keeping a flag Layout(); - // usually will result in TransferDataToWindow() being called + // this usually will result in TransferDataToWindow() being called InitDialog(); } - if ( IsModal() ) + // EndModal may have been called from InitDialog handler, + // which would cause an infinite loop if we didn't take it + // into account + if ( show && IsModal() && !m_endModalCalled ) { - if ( show ) + // modal dialog needs a parent window, so try to find one + if ( !GetParent() ) { - // modal dialog needs a parent window, so try to find one - if ( !GetParent() ) - { - m_parent = FindSuitableParent(); - } - - DoShowModal(); + m_parent = FindSuitableParent(); } - else // end of modal dialog - { - // this will cause IsModalShowing() return FALSE and our local - // message loop will terminate - wxModalDialogs.DeleteObject(this); - // ensure that there is another message for this window so the - // ShowModal loop will exit and won't get stuck in GetMessage(). - ::PostMessage(GetHwnd(), WM_NULL, 0, 0); - } + DoShowModal(); } return TRUE; @@ -406,6 +349,7 @@ void wxDialog::Raise() // a special version for Show(TRUE) for modal dialogs which returns return code int wxDialog::ShowModal() { + m_endModalCalled = FALSE; if ( !IsModal() ) { SetModal(TRUE); @@ -420,6 +364,7 @@ int wxDialog::ShowModal() // dialogs and should work for both of them void wxDialog::EndModal(int retCode) { + m_endModalCalled = TRUE; SetReturnCode(retCode); Show(FALSE); @@ -495,9 +440,9 @@ void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) // dialog window proc // --------------------------------------------------------------------------- -long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { - long rc = 0; + WXLRESULT rc = 0; bool processed = FALSE; switch ( message ) @@ -517,7 +462,7 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) // creates flicker but at least doesn't show garbage on the screen rc = wxWindow::MSWWindowProc(message, wParam, lParam); processed = TRUE; - if ( !HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) ) + if ( HasFlag(wxFULL_REPAINT_ON_RESIZE) ) { ::InvalidateRect(GetHwnd(), NULL, FALSE /* erase bg */); }