X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1970409e33ce5aa182fa40ea499e532fdbf1982d..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/generic/msgdlgg.cpp?ds=sidebyside diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp index d479248158..c3dd7a8067 100644 --- a/src/generic/msgdlgg.cpp +++ b/src/generic/msgdlgg.cpp @@ -16,7 +16,7 @@ #pragma hdrstop #endif -#if wxUSE_MSGDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__) || defined(__WXGPE__)) +#if wxUSE_MSGDLG #ifndef WX_PRECOMP #include "wx/utils.h" @@ -38,11 +38,35 @@ #define __WX_COMPILING_MSGDLGG_CPP__ 1 #include "wx/msgdlg.h" #include "wx/artprov.h" +#include "wx/textwrapper.h" #if wxUSE_STATLINE #include "wx/statline.h" #endif +// ---------------------------------------------------------------------------- +// wxTitleTextWrapper: simple class to create wrapped text in "title font" +// ---------------------------------------------------------------------------- + +class wxTitleTextWrapper : public wxTextSizerWrapper +{ +public: + wxTitleTextWrapper(wxWindow *win) + : wxTextSizerWrapper(win) + { + } + +protected: + virtual wxWindow *OnCreateLine(const wxString& s) + { + wxWindow * const win = wxTextSizerWrapper::OnCreateLine(s); + + win->SetFont(win->GetFont().Larger().MakeBold()); + + return win; + } +}; + // ---------------------------------------------------------------------------- // icons // ---------------------------------------------------------------------------- @@ -50,6 +74,7 @@ BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog) EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes) EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo) + EVT_BUTTON(wxID_HELP, wxGenericMessageDialog::OnHelp) EVT_BUTTON(wxID_CANCEL, wxGenericMessageDialog::OnCancel) END_EVENT_TABLE() @@ -60,7 +85,7 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString& caption, long style, const wxPoint& pos) - : wxMessageDialogBase(GetParentForModalDialog(parent), + : wxMessageDialogBase(GetParentForModalDialog(parent, style), message, caption, style), @@ -69,6 +94,73 @@ wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, m_created = false; } +wxSizer *wxGenericMessageDialog::CreateMsgDlgButtonSizer() +{ +#ifndef __SMARTPHONE__ + if ( HasCustomLabels() ) + { + wxStdDialogButtonSizer * const sizerStd = new wxStdDialogButtonSizer; + + wxButton *btnDef = NULL; + + if ( m_dialogStyle & wxOK ) + { + btnDef = new wxButton(this, wxID_OK, GetCustomOKLabel()); + sizerStd->AddButton(btnDef); + } + + if ( m_dialogStyle & wxCANCEL ) + { + wxButton * const + cancel = new wxButton(this, wxID_CANCEL, GetCustomCancelLabel()); + sizerStd->AddButton(cancel); + + if ( m_dialogStyle & wxCANCEL_DEFAULT ) + btnDef = cancel; + } + + if ( m_dialogStyle & wxYES_NO ) + { + wxButton * const + yes = new wxButton(this, wxID_YES, GetCustomYesLabel()); + sizerStd->AddButton(yes); + + wxButton * const + no = new wxButton(this, wxID_NO, GetCustomNoLabel()); + sizerStd->AddButton(no); + if ( m_dialogStyle & wxNO_DEFAULT ) + btnDef = no; + else if ( !btnDef ) + btnDef = yes; + } + + if ( m_dialogStyle & wxHELP ) + { + wxButton * const + help = new wxButton(this, wxID_HELP, GetCustomHelpLabel()); + sizerStd->AddButton(help); + } + + if ( btnDef ) + { + btnDef->SetDefault(); + btnDef->SetFocus(); + } + + sizerStd->Realize(); + + return CreateSeparatedSizer(sizerStd); + } +#endif // !__SMARTPHONE__ + + // Use standard labels for all buttons + return CreateSeparatedButtonSizer + ( + m_dialogStyle & (wxOK | wxCANCEL | wxHELP | wxYES_NO | + wxNO_DEFAULT | wxCANCEL_DEFAULT) + ); +} + void wxGenericMessageDialog::DoCreateMsgdialog() { wxDialog::Create(m_parent, wxID_ANY, m_caption, m_pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE); @@ -92,24 +184,46 @@ void wxGenericMessageDialog::DoCreateMsgdialog() if (is_pda) topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 ); else - icon_text->Add( icon, 0, wxCENTER ); + icon_text->Add(icon, wxSizerFlags().Top().Border(wxRIGHT, 20)); } #endif // wxUSE_STATBMP #if wxUSE_STATTEXT // 2) text - icon_text->Add( CreateTextSizer( GetFullMessage() ), 0, wxALIGN_CENTER | wxLEFT, 10 ); - topsizer->Add( icon_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 ); + wxBoxSizer * const textsizer = new wxBoxSizer(wxVERTICAL); + + // We want to show the main message in a different font to make it stand + // out if the extended message is used as well. This looks better and is + // more consistent with the native dialogs under MSW and GTK. + wxString lowerMessage; + if ( !m_extendedMessage.empty() ) + { + wxTitleTextWrapper titleWrapper(this); + textsizer->Add(CreateTextSizer(GetMessage(), titleWrapper), + wxSizerFlags().Border(wxBOTTOM, 20)); + + lowerMessage = GetExtendedMessage(); + } + else // no extended message + { + lowerMessage = GetMessage(); + } + + textsizer->Add(CreateTextSizer(lowerMessage)); + + icon_text->Add(textsizer, 0, wxALIGN_CENTER, 10); + topsizer->Add( icon_text, 1, wxLEFT|wxRIGHT|wxTOP, 10 ); #endif // wxUSE_STATTEXT - // 3) buttons - int center_flag = wxEXPAND; - if (m_dialogStyle & wxYES_NO) - center_flag = wxALIGN_CENTRE; - wxSizer *sizerBtn = CreateSeparatedButtonSizer(m_dialogStyle & ButtonSizerFlags); + // 3) optional checkbox and detailed text + AddMessageDialogCheckBox( topsizer ); + AddMessageDialogDetails( topsizer ); + + // 4) buttons + wxSizer *sizerBtn = CreateMsgDlgButtonSizer(); if ( sizerBtn ) - topsizer->Add(sizerBtn, 0, center_flag | wxALL, 10 ); + topsizer->Add(sizerBtn, 0, wxEXPAND | wxALL, 10 ); SetAutoLayout( true ); SetSizer( topsizer ); @@ -136,6 +250,11 @@ void wxGenericMessageDialog::OnNo(wxCommandEvent& WXUNUSED(event)) EndModal( wxID_NO ); } +void wxGenericMessageDialog::OnHelp(wxCommandEvent& WXUNUSED(event)) +{ + EndModal( wxID_HELP ); +} + void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) { // Allow cancellation via ESC/Close button except if @@ -158,4 +277,4 @@ int wxGenericMessageDialog::ShowModal() return wxMessageDialogBase::ShowModal(); } -#endif // wxUSE_MSGDLG && !defined(__WXGTK20__) +#endif // wxUSE_MSGDLG