X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a5137d74ab4f665603d8c8c6518ad4464fc8917..0a81f130246a2c22a47e2eed31d1e640bf94e0fe:/src/generic/msgdlgg.cpp diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp index 06450f44a0..3fd78a7269 100644 --- a/src/generic/msgdlgg.cpp +++ b/src/generic/msgdlgg.cpp @@ -1,18 +1,14 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msgdlgg.cpp +// Name: src/generic/msgdlgg.cpp // Purpose: wxGenericMessageDialog // Author: Julian Smart, Robert Roebling // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart, Markus Holzem, Robert Roebling -// Licence: wxWindows license +// Copyright: (c) Julian Smart and Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "msgdlgg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -20,6 +16,8 @@ #pragma hdrstop #endif +#if wxUSE_MSGDLG + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/dialog.h" @@ -31,22 +29,48 @@ #include "wx/icon.h" #include "wx/sizer.h" #include "wx/app.h" + #include "wx/settings.h" #endif #include #include -#include "wx/generic/msgdlgg.h" +#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" + #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 // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog) EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes) EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo) @@ -54,52 +78,158 @@ BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog) END_EVENT_TABLE() IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog) -#endif wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent, const wxString& message, const wxString& caption, long style, const wxPoint& pos) - : wxDialog( parent, -1, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE ) + : wxMessageDialogBase(GetParentForModalDialog(parent, style), + message, + caption, + style), + m_pos(pos) +{ + m_created = false; +} + +wxSizer *wxGenericMessageDialog::CreateMsgDlgButtonSizer() { - m_dialogStyle = style; +#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); - wxBeginBusyCursor(); + 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 ( btnDef ) + { + btnDef->SetDefault(); + btnDef->SetFocus(); + } + + sizerStd->Realize(); + + return CreateSeparatedSizer(sizerStd); + } +#endif // !__SMARTPHONE__ + + // Use standard labels for all buttons + return CreateSeparatedButtonSizer + ( + m_dialogStyle & (wxOK | wxCANCEL | wxYES_NO | + wxNO_DEFAULT | wxCANCEL_DEFAULT) + ); +} + +void wxGenericMessageDialog::DoCreateMsgdialog() +{ + wxDialog::Create(m_parent, wxID_ANY, m_caption, m_pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE); + + bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL ); - + +#if wxUSE_STATBMP // 1) icon - if (style & wxICON_MASK) + if (m_dialogStyle & wxICON_MASK) { - wxStaticBitmap *icon = new wxStaticBitmap( - this, -1, wxTheApp->GetStdIcon(style & wxICON_MASK)); - icon_text->Add( icon, 0, wxCENTER ); + wxStaticBitmap *icon = new wxStaticBitmap + ( + this, + wxID_ANY, + wxArtProvider::GetMessageBoxIcon(m_dialogStyle) + ); + if (is_pda) + topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 ); + else + icon_text->Add(icon, wxSizerFlags().Top().Border(wxRIGHT, 20)); } - +#endif // wxUSE_STATBMP + +#if wxUSE_STATTEXT // 2) text - icon_text->Add( CreateTextSizer( message ), 0, wxCENTER | wxLEFT, 10 ); - - topsizer->Add( icon_text, 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 ); - -#if wxUSE_STATLINE - // 3) static line - topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); -#endif + + 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) optional checkbox and detailed text + AddMessageDialogCheckBox( topsizer ); + AddMessageDialogDetails( topsizer ); // 4) buttons - topsizer->Add( CreateButtonSizer( style ), 0, wxCENTRE | wxALL, 10 ); + wxSizer *sizerBtn = CreateMsgDlgButtonSizer(); + if ( sizerBtn ) + topsizer->Add(sizerBtn, 0, wxEXPAND | wxALL, 10 ); + + SetAutoLayout( true ); + SetSizer( topsizer ); topsizer->SetSizeHints( this ); topsizer->Fit( this ); - SetSizer( topsizer ); - SetAutoLayout( TRUE ); + wxSize size( GetSize() ); + if (size.x < size.y*3/2) + { + size.x = size.y*3/2; + SetSize( size ); + } Centre( wxBOTH | wxCENTER_FRAME); - - wxEndBusyCursor(); } void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event)) @@ -114,12 +244,24 @@ void wxGenericMessageDialog::OnNo(wxCommandEvent& WXUNUSED(event)) void wxGenericMessageDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) { - /* Allow cancellation via ESC/Close button except if - only YES and NO are specified. */ - if ( (m_dialogStyle & wxYES_NO) != wxYES_NO || (m_dialogStyle & wxCANCEL) ) + // Allow cancellation via ESC/Close button except if + // only YES and NO are specified. + const long style = GetMessageDialogStyle(); + if ( (style & wxYES_NO) != wxYES_NO || (style & wxCANCEL) ) { EndModal( wxID_CANCEL ); } } +int wxGenericMessageDialog::ShowModal() +{ + if ( !m_created ) + { + m_created = true; + DoCreateMsgdialog(); + } + + return wxMessageDialogBase::ShowModal(); +} +#endif // wxUSE_MSGDLG