X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d4c4ba89b6d6a211d61804217ea004d28c59c01..66f75561893ea7b4bf429d1882d9cc0407ba932d:/src/common/dlgcmn.cpp diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp index 631d459b39..69e0180b86 100644 --- a/src/common/dlgcmn.cpp +++ b/src/common/dlgcmn.cpp @@ -116,12 +116,13 @@ wxWindow *wxDialogBase::CheckIfCanBeUsedAsParent(wxWindow *parent) const return parent; } -wxWindow *wxDialogBase::GetParentForModalDialog(wxWindow *parent) const +wxWindow * +wxDialogBase::GetParentForModalDialog(wxWindow *parent, long style) const { // creating a parent-less modal dialog will result (under e.g. wxGTK2) // in an unfocused dialog, so try to find a valid parent for it unless we // were explicitly asked not to - if ( HasFlag(wxDIALOG_NO_PARENT) ) + if ( style & wxDIALOG_NO_PARENT ) return NULL; // first try the given parent @@ -142,45 +143,15 @@ wxWindow *wxDialogBase::GetParentForModalDialog(wxWindow *parent) const #if wxUSE_STATTEXT -class wxTextSizerWrapper : public wxTextWrapper +wxSizer *wxDialogBase::CreateTextSizer(const wxString& message) { -public: - wxTextSizerWrapper(wxWindow *win) - { - m_win = win; - m_hLine = 0; - } - - wxSizer *CreateSizer(const wxString& text, int widthMax) - { - m_sizer = new wxBoxSizer(wxVERTICAL); - Wrap(m_win, text, widthMax); - return m_sizer; - } - -protected: - virtual void OnOutputLine(const wxString& line) - { - if ( !line.empty() ) - { - m_sizer->Add(new wxStaticText(m_win, wxID_ANY, line)); - } - else // empty line, no need to create a control for it - { - if ( !m_hLine ) - m_hLine = m_win->GetCharHeight(); - - m_sizer->Add(5, m_hLine); - } - } + wxTextSizerWrapper wrapper(this); -private: - wxWindow *m_win; - wxSizer *m_sizer; - int m_hLine; -}; + return CreateTextSizer(message, wrapper); +} -wxSizer *wxDialogBase::CreateTextSizer(const wxString& message) +wxSizer *wxDialogBase::CreateTextSizer(const wxString& message, + wxTextSizerWrapper& wrapper) { // I admit that this is complete bogus, but it makes // message boxes work for pda screens temporarily.. @@ -197,8 +168,6 @@ wxSizer *wxDialogBase::CreateTextSizer(const wxString& message) wxString text(message); text.Replace(wxT("&"), wxT("&&")); - wxTextSizerWrapper wrapper(this); - return wrapper.CreateSizer(text, widthMax); } @@ -249,12 +218,8 @@ wxSizer *wxDialogBase::CreateButtonSizer(long flags) #endif // __SMARTPHONE__/!__SMARTPHONE__ } -wxSizer *wxDialogBase::CreateSeparatedButtonSizer(long flags) +wxSizer *wxDialogBase::CreateSeparatedSizer(wxSizer *sizer) { - wxSizer *sizer = CreateButtonSizer(flags); - if ( !sizer ) - return NULL; - // Mac Human Interface Guidelines recommend not to use static lines as // grouping elements #if wxUSE_STATLINE && !defined(__WXMAC__) @@ -268,6 +233,15 @@ wxSizer *wxDialogBase::CreateSeparatedButtonSizer(long flags) return sizer; } +wxSizer *wxDialogBase::CreateSeparatedButtonSizer(long flags) +{ + wxSizer *sizer = CreateButtonSizer(flags); + if ( !sizer ) + return NULL; + + return CreateSeparatedSizer(sizer); +} + #if wxUSE_BUTTON wxStdDialogButtonSizer *wxDialogBase::CreateStdDialogButtonSizer( long flags ) @@ -403,6 +377,32 @@ bool wxDialogBase::EmulateButtonClickIfPresent(int id) #endif // wxUSE_BUTTON/!wxUSE_BUTTON } +bool wxDialogBase::SendCloseButtonClickEvent() +{ + int idCancel = GetEscapeId(); + switch ( idCancel ) + { + case wxID_NONE: + // The user doesn't want this dialog to close "implicitly". + break; + + case wxID_ANY: + // this value is special: it means translate Esc to wxID_CANCEL + // but if there is no such button, then fall back to wxID_OK + if ( EmulateButtonClickIfPresent(wxID_CANCEL) ) + return true; + idCancel = GetAffirmativeId(); + // fall through + + default: + // translate Esc to button press for the button with given id + if ( EmulateButtonClickIfPresent(idCancel) ) + return true; + } + + return false; +} + bool wxDialogBase::IsEscapeKey(const wxKeyEvent& event) { // for most platforms, Esc key is used to close the dialogs @@ -414,25 +414,10 @@ void wxDialogBase::OnCharHook(wxKeyEvent& event) { if ( event.GetKeyCode() == WXK_ESCAPE ) { - int idCancel = GetEscapeId(); - switch ( idCancel ) + if ( SendCloseButtonClickEvent() ) { - case wxID_NONE: - // don't handle Esc specially at all - break; - - case wxID_ANY: - // this value is special: it means translate Esc to wxID_CANCEL - // but if there is no such button, then fall back to wxID_OK - if ( EmulateButtonClickIfPresent(wxID_CANCEL) ) - return; - idCancel = GetAffirmativeId(); - // fall through - - default: - // translate Esc to button press for the button with given id - if ( EmulateButtonClickIfPresent(idCancel) ) - return; + // Skip the call to event.Skip() below, we did handle this key. + return; } } @@ -476,12 +461,11 @@ void wxDialogBase::ShowWindowModal () { ShowModal(); SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED ); - return true; } void wxDialogBase::SendWindowModalDialogEvent ( wxEventType type ) { - wxCommandEvent event ( type, GetId()); + wxWindowModalDialogEvent event ( type, GetId()); event.SetEventObject(this); if ( !GetEventHandler()->ProcessEvent(event) ) @@ -507,23 +491,9 @@ wxDialogModality wxDialogBase::GetModality() const void wxDialogBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) { // 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. - - int idCancel = GetEscapeId(); - if ( idCancel == wxID_NONE ) - return; - if ( idCancel == wxID_ANY ) - idCancel = wxID_CANCEL; + // Check for looping if the Cancel event handler calls Close(). + // // VZ: this is horrible and MT-unsafe. Can't we reuse some of these global // lists here? don't dare to change it now, but should be done later! static wxList closing; @@ -533,9 +503,17 @@ void wxDialogBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) closing.Append(this); - wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, idCancel); - cancelEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog + if ( !SendCloseButtonClickEvent() ) + { + // If the handler didn't close the dialog (e.g. because there is no + // button with matching id) we still want to close it when the user + // clicks the "x" button in the title bar, otherwise we shouldn't even + // have put it there. + // + // Notice that using wxID_CLOSE might have been a better choice but we + // use wxID_CANCEL for compatibility reasons. + EndDialog(wxID_CANCEL); + } closing.DeleteObject(this); } @@ -655,6 +633,7 @@ bool wxStandardDialogLayoutAdapter::DoLayoutAdaptation(wxDialog* dialog) else #endif // wxUSE_BOOKCTRL { +#if wxUSE_BUTTON // If we have an arbitrary dialog, create a scrolling area for the main content, and a button sizer // for the main buttons. wxScrolledWindow* scrolledWindow = CreateScrolledWindow(dialog); @@ -680,8 +659,7 @@ bool wxStandardDialogLayoutAdapter::DoLayoutAdaptation(wxDialog* dialog) stdButtonSizer->Realize(); else { - delete buttonSizer; - buttonSizer = NULL; + wxDELETE(buttonSizer); } } @@ -702,6 +680,7 @@ bool wxStandardDialogLayoutAdapter::DoLayoutAdaptation(wxDialog* dialog) scrolledWindow->SetSizer(oldSizer); FitWithScrolling(dialog, scrolledWindow); +#endif // wxUSE_BUTTON } } @@ -716,6 +695,8 @@ wxScrolledWindow* wxStandardDialogLayoutAdapter::CreateScrolledWindow(wxWindow* return scrolledWindow; } +#if wxUSE_BUTTON + /// Find and remove the button sizer, if any wxSizer* wxStandardDialogLayoutAdapter::FindButtonSizer(bool stdButtonSizer, wxDialog* dialog, wxSizer* sizer, int& retBorder, int accumlatedBorder) { @@ -813,6 +794,8 @@ bool wxStandardDialogLayoutAdapter::FindLooseButtons(wxDialog* dialog, wxStdDial return true; } +#endif // wxUSE_BUTTON + /// Reparent the controls to the scrolled window void wxStandardDialogLayoutAdapter::ReparentControls(wxWindow* parent, wxWindow* reparentTo, wxSizer* buttonSizer) {