X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8b3f03601046ff3ab87eb4e9a68d569250511e0..ec080ef1873995bcd9b20b0fc1a6d208a78540d3:/src/common/dlgcmn.cpp diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp index e386099c3a..8d127fa5e2 100644 --- a/src/common/dlgcmn.cpp +++ b/src/common/dlgcmn.cpp @@ -40,9 +40,9 @@ #include "wx/statline.h" #include "wx/sysopt.h" #include "wx/module.h" -#include "wx/private/stattext.h" #include "wx/bookctrl.h" #include "wx/scrolwin.h" +#include "wx/textwrapper.h" #if wxUSE_DISPLAY #include "wx/display.h" @@ -78,77 +78,80 @@ void wxDialogBase::Init() SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS); } -// helper of GetParentForModalDialog() -static bool CanBeUsedAsParent(wxWindow *parent) +wxWindow *wxDialogBase::CheckIfCanBeUsedAsParent(wxWindow *parent) const { - extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete; + if ( !parent ) + return NULL; - return !parent->HasExtraStyle(wxWS_EX_TRANSIENT) && - parent->IsShownOnScreen() && - !wxPendingDelete.Member(parent) && - !parent->IsBeingDeleted(); -} + extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete; + if ( wxPendingDelete.Member(parent) || parent->IsBeingDeleted() ) + { + // this window is being deleted and we shouldn't create any children + // under it + return NULL; + } -wxWindow *wxDialogBase::GetParentForModalDialog(wxWindow *parent) 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: - if ( parent ) - parent = wxGetTopLevelParent(parent); + if ( parent->HasExtraStyle(wxWS_EX_TRANSIENT) ) + { + // this window is not being deleted yet but it's going to disappear + // soon so still don't parent this window under it + return NULL; + } - if ( !parent || !CanBeUsedAsParent(parent) ) - parent = wxTheApp->GetTopWindow(); + if ( !parent->IsShownOnScreen() ) + { + // using hidden parent won't work correctly neither + return NULL; + } - if ( parent && !CanBeUsedAsParent(parent) ) + // FIXME-VC6: this compiler requires an explicit const cast or it fails + // with error C2446 + if ( const_cast(parent) == this ) { - // can't use this one, it's going to disappear - parent = NULL; + // not sure if this can really happen but it doesn't hurt to guard + // against this clearly invalid situation + return NULL; } return parent; } -#if wxUSE_STATTEXT - -class wxTextSizerWrapper : public wxTextWrapper +wxWindow * +wxDialogBase::GetParentForModalDialog(wxWindow *parent, long style) const { -public: - wxTextSizerWrapper(wxWindow *win) - { - m_win = win; - m_hLine = 0; - } + // 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 ( style & wxDIALOG_NO_PARENT ) + return NULL; - wxSizer *CreateSizer(const wxString& text, int widthMax) - { - m_sizer = new wxBoxSizer(wxVERTICAL); - Wrap(m_win, text, widthMax); - return m_sizer; - } + // first try the given parent + if ( parent ) + parent = CheckIfCanBeUsedAsParent(wxGetTopLevelParent(parent)); -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(); + // then the currently active window + if ( !parent ) + parent = CheckIfCanBeUsedAsParent( + wxGetTopLevelParent(wxGetActiveWindow())); - m_sizer->Add(5, m_hLine); - } - } + // and finally the application main window + if ( !parent ) + parent = CheckIfCanBeUsedAsParent(wxTheApp->GetTopWindow()); -private: - wxWindow *m_win; - wxSizer *m_sizer; - int m_hLine; -}; + return parent; +} + +#if wxUSE_STATTEXT wxSizer *wxDialogBase::CreateTextSizer(const wxString& message) +{ + wxTextSizerWrapper wrapper(this); + + return CreateTextSizer(message, wrapper); +} + +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.. @@ -163,9 +166,7 @@ wxSizer *wxDialogBase::CreateTextSizer(const wxString& message) // the static messages created by CreateTextSizer() (used by wxMessageBox, // for example), we don't want this special meaning, so we need to quote it wxString text(message); - text.Replace(_T("&"), _T("&&")); - - wxTextSizerWrapper wrapper(this); + text.Replace(wxT("&"), wxT("&&")); return wrapper.CreateSizer(text, widthMax); } @@ -174,8 +175,6 @@ wxSizer *wxDialogBase::CreateTextSizer(const wxString& message) wxSizer *wxDialogBase::CreateButtonSizer(long flags) { - wxSizer *sizer = NULL; - #ifdef __SMARTPHONE__ wxDialog* dialog = (wxDialog*) this; if ( flags & wxOK ) @@ -189,6 +188,8 @@ wxSizer *wxDialogBase::CreateButtonSizer(long flags) if ( flags & wxNO ) dialog->SetRightMenu(wxID_NO); + + return NULL; #else // !__SMARTPHONE__ #if wxUSE_BUTTON @@ -202,15 +203,19 @@ wxSizer *wxDialogBase::CreateButtonSizer(long flags) wxSystemOptions::GetOptionInt(wxT("wince.dialog.real-ok-cancel")) ) #endif // __POCKETPC__ { - sizer = CreateStdDialogButtonSizer(flags); + return CreateStdDialogButtonSizer(flags); } +#ifdef __POCKETPC__ + return NULL; +#endif // __POCKETPC__ + #else // !wxUSE_BUTTON wxUnusedVar(flags); + + return NULL; #endif // wxUSE_BUTTON/!wxUSE_BUTTON #endif // __SMARTPHONE__/!__SMARTPHONE__ - - return sizer; } wxSizer *wxDialogBase::CreateSeparatedButtonSizer(long flags) @@ -428,6 +433,41 @@ void wxDialogBase::OnButton(wxCommandEvent& event) } } +// ---------------------------------------------------------------------------- +// compatibility methods for supporting the modality API +// ---------------------------------------------------------------------------- + +wxDEFINE_EVENT( wxEVT_WINDOW_MODAL_DIALOG_CLOSED , wxWindowModalDialogEvent ); + +IMPLEMENT_DYNAMIC_CLASS(wxWindowModalDialogEvent, wxCommandEvent) + +void wxDialogBase::ShowWindowModal () +{ + ShowModal(); + SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED ); +} + +void wxDialogBase::SendWindowModalDialogEvent ( wxEventType type ) +{ + wxWindowModalDialogEvent event ( type, GetId()); + event.SetEventObject(this); + + if ( !GetEventHandler()->ProcessEvent(event) ) + { + // the event is not propagated upwards to the parent automatically + // because the dialog is a top level window, so do it manually as + // in 9 cases of 10 the message must be processed by the dialog + // owner and not the dialog itself + (void)GetParent()->GetEventHandler()->ProcessEvent(event); + } +} + + +wxDialogModality wxDialogBase::GetModality() const +{ + return IsModal() ? wxDIALOG_MODALITY_APP_MODAL : wxDIALOG_MODALITY_NONE; +} + // ---------------------------------------------------------------------------- // other event handlers // ---------------------------------------------------------------------------- @@ -446,6 +486,12 @@ void wxDialogBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) // 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; + // 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; @@ -455,7 +501,7 @@ void wxDialogBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) closing.Append(this); - wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); + wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, idCancel); cancelEvent.SetEventObject( this ); GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog @@ -476,7 +522,17 @@ void wxDialogBase::OnSysColourChanged(wxSysColourChangedEvent& event) bool wxDialogBase::DoLayoutAdaptation() { if (GetLayoutAdapter()) - return GetLayoutAdapter()->DoLayoutAdaptation((wxDialog*) this); + { + wxWindow* focusWindow = wxFindFocusDescendant(this); // from event.h + if (GetLayoutAdapter()->DoLayoutAdaptation((wxDialog*) this)) + { + if (focusWindow) + focusWindow->SetFocus(); + return true; + } + else + return false; + } else return false; } @@ -592,8 +648,7 @@ bool wxStandardDialogLayoutAdapter::DoLayoutAdaptation(wxDialog* dialog) stdButtonSizer->Realize(); else { - delete buttonSizer; - buttonSizer = NULL; + wxDELETE(buttonSizer); } }