X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c9a19aabab3a878b565e6c2a5f2a3824277c4dc..86b79b93fbbb0c2e90e6595f7fea0f979b80881c:/src/msw/dialog.cpp diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp index c18d222798..9e94d472c4 100644 --- a/src/msw/dialog.cpp +++ b/src/msw/dialog.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dialog.h" #endif @@ -40,48 +40,108 @@ #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 // ---------------------------------------------------------------------------- +#if wxUSE_EXTENDED_RTTI +WX_DEFINE_FLAGS( wxDialogStyle ) + +wxBEGIN_FLAGS( wxDialogStyle ) + // new style border flags, we put them first to + // use them for streaming out + 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 + 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 + wxFLAGS_MEMBER(wxTAB_TRAVERSAL) + wxFLAGS_MEMBER(wxCLIP_CHILDREN) + + // dialog styles + 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") + +wxBEGIN_PROPERTIES_TABLE(wxDialog) + wxPROPERTY( Title, wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxPROPERTY_FLAGS( WindowStyle , wxDialogStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxDialog) +wxEND_HANDLERS_TABLE() + +wxCONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle) + +#else IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow) +#endif 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 +// ---------------------------------------------------------------------------- + +// 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 // ============================================================================ @@ -93,12 +153,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, @@ -109,8 +166,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 @@ -122,25 +177,33 @@ 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; } -void wxDialog::SetModal(bool flag) +// 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) { - if ( flag ) - { - m_windowStyle |= wxDIALOG_MODAL; + Init(); - wxModelessWindows.DeleteObject(this); - } - else - { - m_windowStyle &= ~wxDIALOG_MODAL; + Create(parent, -1, title, wxPoint(x, y), wxSize(w, h), style, name); +} - wxModelessWindows.Append(this); - } +void wxDialog::SetModal(bool WXUNUSED(flag)) +{ + // nothing to do, obsolete method } wxDialog::~wxDialog() @@ -151,47 +214,13 @@ 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 // ---------------------------------------------------------------------------- -bool wxDialog::IsModal() const -{ - return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0; -} - bool wxDialog::IsModalShowing() const { - return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast + return IsModal(); } wxWindow *wxDialog::FindSuitableParent() const @@ -216,83 +245,16 @@ wxWindow *wxDialog::FindSuitableParent() const return parent; } -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; - - // 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 = 0; - if (oldFocus) - hwndOldFocus = (HWND) oldFocus->GetHWND(); - - // remember where the focus was - if ( !oldFocus ) - { - oldFocus = parent; - if ( parent ) - 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(); - } - - 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 - // for a modal dialog that has been destroyed before calling EndModal). - if ( oldFocus && (oldFocus != this) && ::IsWindow(hwndOldFocus)) - { - // This is likely to prove that the object still exists - if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus) - oldFocus->SetFocus(); - } -} - 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 @@ -312,50 +274,81 @@ 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() ) + return TRUE; +} + +void wxDialog::Raise() +{ + ::SetForegroundWindow(GetHwnd()); +} + +// show dialog modally +int wxDialog::ShowModal() +{ + wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") ); + + m_endModalCalled = FALSE; + + 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 ( show ) + // modal dialog needs a parent window, so try to find one + wxWindow *parent = GetParent(); + if ( !parent ) { - // modal dialog needs a parent window, so try to find one - if ( !GetParent() ) - { - m_parent = FindSuitableParent(); - } + parent = FindSuitableParent(); + } - DoShowModal(); + // remember where the focus was + wxWindow *oldFocus = m_oldFocus; + if ( !oldFocus ) + { + // VZ: do we really want to do this? + oldFocus = parent; } - else // end of modal dialog + + // 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; + + + // enter and run the modal loop { - // this will cause IsModalShowing() return FALSE and our local - // message loop will terminate - wxModalDialogs.DeleteObject(this); + wxDialogModalDataTiedPtr modalData(&m_modalData, + new wxDialogModalData(this)); + modalData->RunLoop(); } - } - return TRUE; -} -// a special version for Show(TRUE) for modal dialogs which returns return code -int wxDialog::ShowModal() -{ - if ( !IsModal() ) - { - SetModal(TRUE); + // 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) && ::IsWindow(hwndOldFocus)) + { + // This is likely to prove that the object still exists + if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus) + oldFocus->SetFocus(); + } } - Show(TRUE); - return GetReturnCode(); } -// NB: this function (surprizingly) may be called for both modal and modeless -// dialogs and should work for both of them void wxDialog::EndModal(int retCode) { + wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") ); + + m_endModalCalled = TRUE; SetReturnCode(retCode); Show(FALSE); @@ -431,13 +424,29 @@ 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 ) { +#ifdef __WXWINCE__ + // react to pressing the OK button in the title + case WM_COMMAND: + if (LOWORD(wParam) == IDOK) + { + wxButton *btn = wxDynamicCast(FindWindow(wxID_CANCEL), wxButton); + if ( btn && btn->IsEnabled() ) + { + // if we do have a cancel button, do press it + btn->MSWCommand(BN_CLICKED, 0 /* unused */); + processed = TRUE; + break; + } + } + break; +#endif case WM_CLOSE: // if we can't close, tell the system that we processed the // message - otherwise it would close us @@ -453,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 */); } @@ -464,7 +473,7 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) // we want to override the busy cursor for modal dialogs: // typically, wxBeginBusyCursor() is called and then a modal dialog // is shown, but the modal dialog shouldn't have hourglass cursor - if ( IsModalShowing() && wxIsBusy() ) + if ( IsModal() && wxIsBusy() ) { // set our cursor for all windows (but see below) wxCursor cursor = m_cursor;