/////////////////////////////////////////////////////////////////////////////
-// Name: msgdlgg.cpp
+// Name: src/generic/msgdlgg.cpp
// Purpose: wxGenericMessageDialog
// Author: Julian Smart, Robert Roebling
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "msgdlgg.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
-#if wxUSE_MSGDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__) || defined(__WXGPE__))
+#if wxUSE_MSGDLG
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/icon.h"
#include "wx/sizer.h"
#include "wx/app.h"
+ #include "wx/settings.h"
#endif
#include <stdio.h>
#include <string.h>
-#include "wx/generic/msgdlgg.h"
+#define __WX_COMPILING_MSGDLGG_CPP__ 1
+#include "wx/msgdlg.h"
#include "wx/artprov.h"
-#include "wx/settings.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
// ----------------------------------------------------------------------------
const wxString& caption,
long style,
const wxPoint& pos)
- : wxDialog( parent, wxID_ANY, caption, pos, wxDefaultSize, wxDEFAULT_DIALOG_STYLE )
+ : wxMessageDialogBase(GetParentForModalDialog(parent, style),
+ message,
+ caption,
+ style),
+ m_pos(pos)
{
- m_dialogStyle = style;
-
- bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+ m_created = false;
+}
- wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+wxSizer *wxGenericMessageDialog::CreateMsgDlgButtonSizer()
+{
+#ifndef __SMARTPHONE__
+ if ( HasCustomLabels() )
+ {
+ wxStdDialogButtonSizer * const sizerStd = new wxStdDialogButtonSizer;
- wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
+ wxButton *btnDef = NULL;
- // 1) icon
- if (style & wxICON_MASK)
- {
- wxBitmap bitmap;
- switch ( style & wxICON_MASK )
+ if ( m_dialogStyle & wxOK )
{
- default:
- wxFAIL_MSG(_T("incorrect log style"));
- // fall through
+ btnDef = new wxButton(this, wxID_OK, GetCustomOKLabel());
+ sizerStd->AddButton(btnDef);
+ }
- case wxICON_ERROR:
- bitmap = wxArtProvider::GetIcon(wxART_ERROR, wxART_MESSAGE_BOX);
- break;
+ if ( m_dialogStyle & wxCANCEL )
+ {
+ wxButton * const
+ cancel = new wxButton(this, wxID_CANCEL, GetCustomCancelLabel());
+ sizerStd->AddButton(cancel);
- case wxICON_INFORMATION:
- bitmap = wxArtProvider::GetIcon(wxART_INFORMATION, wxART_MESSAGE_BOX);
- break;
+ if ( m_dialogStyle & wxCANCEL_DEFAULT )
+ btnDef = cancel;
+ }
- case wxICON_WARNING:
- bitmap = wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX);
- break;
+ 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;
+ }
- case wxICON_QUESTION:
- bitmap = wxArtProvider::GetIcon(wxART_QUESTION, wxART_MESSAGE_BOX);
- break;
+ if ( btnDef )
+ {
+ btnDef->SetDefault();
+ btnDef->SetFocus();
}
- wxStaticBitmap *icon = new wxStaticBitmap(this, wxID_ANY, bitmap);
+
+ 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 (m_dialogStyle & wxICON_MASK)
+ {
+ 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, 0, wxCENTER );
+ 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, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
+ wxBoxSizer * const textsizer = new wxBoxSizer(wxVERTICAL);
-#if wxUSE_STATLINE
- // 3) static line
- topsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
-#endif // wxUSE_STATLINE
+ // 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 & (wxOK|wxCANCEL|wxYES_NO|wxYES_DEFAULT|wxNO_DEFAULT) ),
- 0, wxEXPAND | wxALL, 10 );
+ wxSizer *sizerBtn = CreateMsgDlgButtonSizer();
+ if ( sizerBtn )
+ topsizer->Add(sizerBtn, 0, wxEXPAND | wxALL, 10 );
SetAutoLayout( true );
SetSizer( topsizer );
{
// Allow cancellation via ESC/Close button except if
// only YES and NO are specified.
- if ( (m_dialogStyle & wxYES_NO) != wxYES_NO || (m_dialogStyle & wxCANCEL) )
+ const long style = GetMessageDialogStyle();
+ if ( (style & wxYES_NO) != wxYES_NO || (style & wxCANCEL) )
{
EndModal( wxID_CANCEL );
}
}
-#endif // wxUSE_MSGDLG && !defined(__WXGTK20__)
+int wxGenericMessageDialog::ShowModal()
+{
+ if ( !m_created )
+ {
+ m_created = true;
+ DoCreateMsgdialog();
+ }
+
+ return wxMessageDialogBase::ShowModal();
+}
+#endif // wxUSE_MSGDLG
projects / wxWidgets.git / blobdiff