X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffca575c83935a6382d2d471c4692928d26ac5fe..3bf5a59b5e058bebffcf9d87f03550b4ecf93e73:/src/msw/dialog.cpp diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index d0f9d78dfd..94cf00190a 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -40,6 +40,8 @@ #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 @@ -57,13 +59,6 @@ #define wxDIALOG_DEFAULT_WIDTH 500 #define wxDIALOG_DEFAULT_HEIGHT 500 -// ---------------------------------------------------------------------------- -// globals -// ---------------------------------------------------------------------------- - -// all modal dialogs currently shown -static wxWindowList wxModalDialogs; - // ---------------------------------------------------------------------------- // wxWin macros // ---------------------------------------------------------------------------- @@ -71,55 +66,55 @@ static wxWindowList wxModalDialogs; #if wxUSE_EXTENDED_RTTI WX_DEFINE_FLAGS( wxDialogStyle ) -WX_BEGIN_FLAGS( wxDialogStyle ) +wxBEGIN_FLAGS( wxDialogStyle ) // new style border flags, we put them first to // use them for streaming out - WX_FLAGS_MEMBER(wxBORDER_SIMPLE) - WX_FLAGS_MEMBER(wxBORDER_SUNKEN) - WX_FLAGS_MEMBER(wxBORDER_DOUBLE) - WX_FLAGS_MEMBER(wxBORDER_RAISED) - WX_FLAGS_MEMBER(wxBORDER_STATIC) - WX_FLAGS_MEMBER(wxBORDER_NONE) + wxFLAGS_MEMBER(wxBORDER_SIMPLE) + wxFLAGS_MEMBER(wxBORDER_SUNKEN) + wxFLAGS_MEMBER(wxBORDER_DOUBLE) + wxFLAGS_MEMBER(wxBORDER_RAISED) + wxFLAGS_MEMBER(wxBORDER_STATIC) + wxFLAGS_MEMBER(wxBORDER_NONE) // old style border flags - WX_FLAGS_MEMBER(wxSIMPLE_BORDER) - WX_FLAGS_MEMBER(wxSUNKEN_BORDER) - WX_FLAGS_MEMBER(wxDOUBLE_BORDER) - WX_FLAGS_MEMBER(wxRAISED_BORDER) - WX_FLAGS_MEMBER(wxSTATIC_BORDER) - WX_FLAGS_MEMBER(wxNO_BORDER) + wxFLAGS_MEMBER(wxSIMPLE_BORDER) + wxFLAGS_MEMBER(wxSUNKEN_BORDER) + wxFLAGS_MEMBER(wxDOUBLE_BORDER) + wxFLAGS_MEMBER(wxRAISED_BORDER) + wxFLAGS_MEMBER(wxSTATIC_BORDER) + wxFLAGS_MEMBER(wxNO_BORDER) // standard window styles - WX_FLAGS_MEMBER(wxTAB_TRAVERSAL) - WX_FLAGS_MEMBER(wxCLIP_CHILDREN) + wxFLAGS_MEMBER(wxTAB_TRAVERSAL) + wxFLAGS_MEMBER(wxCLIP_CHILDREN) // dialog styles - WX_FLAGS_MEMBER(wxDIALOG_MODAL) - WX_FLAGS_MEMBER(wxDIALOG_MODELESS) - WX_FLAGS_MEMBER(wxNO_3D) - WX_FLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY) - WX_FLAGS_MEMBER(wxSTAY_ON_TOP) - WX_FLAGS_MEMBER(wxCAPTION) - WX_FLAGS_MEMBER(wxTHICK_FRAME) - WX_FLAGS_MEMBER(wxSYSTEM_MENU) - WX_FLAGS_MEMBER(wxRESIZE_BORDER) - WX_FLAGS_MEMBER(wxRESIZE_BOX) - WX_FLAGS_MEMBER(wxCLOSE_BOX) - WX_FLAGS_MEMBER(wxMAXIMIZE_BOX) - WX_FLAGS_MEMBER(wxMINIMIZE_BOX) -WX_END_FLAGS( wxDialogStyle ) + wxFLAGS_MEMBER(wxDIALOG_MODAL) + wxFLAGS_MEMBER(wxDIALOG_MODELESS) + wxFLAGS_MEMBER(wxNO_3D) + wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY) + wxFLAGS_MEMBER(wxSTAY_ON_TOP) + wxFLAGS_MEMBER(wxCAPTION) + wxFLAGS_MEMBER(wxTHICK_FRAME) + wxFLAGS_MEMBER(wxSYSTEM_MENU) + wxFLAGS_MEMBER(wxRESIZE_BORDER) + wxFLAGS_MEMBER(wxRESIZE_BOX) + wxFLAGS_MEMBER(wxCLOSE_BOX) + wxFLAGS_MEMBER(wxMAXIMIZE_BOX) + wxFLAGS_MEMBER(wxMINIMIZE_BOX) +wxEND_FLAGS( wxDialogStyle ) IMPLEMENT_DYNAMIC_CLASS_XTI(wxDialog, wxTopLevelWindow,"wx/dialog.h") -WX_BEGIN_PROPERTIES_TABLE(wxDialog) - WX_PROPERTY( Title,wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - WX_PROPERTY_FLAGS( WindowStyle , wxDialogStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style -WX_END_PROPERTIES_TABLE() +wxBEGIN_PROPERTIES_TABLE(wxDialog) + wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY_FLAGS( WindowStyle , wxDialogStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style +wxEND_PROPERTIES_TABLE() -WX_BEGIN_HANDLERS_TABLE(wxDialog) -WX_END_HANDLERS_TABLE() +wxBEGIN_HANDLERS_TABLE(wxDialog) +wxEND_HANDLERS_TABLE() -WX_CONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle) +wxCONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle) #else IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) @@ -137,6 +132,33 @@ BEGIN_EVENT_TABLE(wxDialog, wxDialogBase) 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 // ============================================================================ @@ -151,7 +173,7 @@ void wxDialog::Init() m_isShown = FALSE; - m_windowDisabler = (wxWindowDisabler *)NULL; + m_modalData = NULL; SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); } @@ -246,7 +268,7 @@ bool wxDialog::IsModal() const bool wxDialog::IsModalShowing() const { - return wxModalDialogs.Find(wxConstCast(this, wxDialog)) != NULL; + return m_modalData != NULL; } wxWindow *wxDialog::FindSuitableParent() const @@ -276,8 +298,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 +317,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 +338,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 +365,19 @@ 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() ) + if ( show && IsModal() ) { - 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; @@ -517,7 +502,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 */); }