/////////////////////////////////////////////////////////////////////////////
-// Name: msgdlgg.cpp
+// Name: src/generic/msgdlgg.cpp
// Purpose: wxGenericMessageDialog
-// Author: Julian Smart
+// Author: Julian Smart, Robert Roebling
// Modified by:
// Created: 04/01/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// 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"
#pragma hdrstop
#endif
+#if wxUSE_MSGDLG
+
#ifndef WX_PRECOMP
-#include "wx/utils.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
-#include "wx/button.h"
-#include "wx/stattext.h"
-#include "wx/layout.h"
-#include "wx/intl.h"
+ #include "wx/utils.h"
+ #include "wx/dialog.h"
+ #include "wx/button.h"
+ #include "wx/stattext.h"
+ #include "wx/statbmp.h"
+ #include "wx/layout.h"
+ #include "wx/intl.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/textwrapper.h"
+#include "wx/modalhook.h"
-///////////////////////////////////////////////////////////////////
-// New dialog box implementations
+#if wxUSE_STATLINE
+ #include "wx/statline.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// wxTitleTextWrapper: simple class to create wrapped text in "title font"
+// ----------------------------------------------------------------------------
-// Split message, using constraints to position controls
-void wxSplitMessage2(const char *message, wxList *messageList, wxWindow *parent, wxRowColSizer *sizer)
+class wxTitleTextWrapper : public wxTextSizerWrapper
{
- char *copyMessage = copystring(message);
- size_t i = 0;
- size_t len = strlen(copyMessage);
- char *currentMessage = copyMessage;
-
-// wxWindow *lastWindow = parent;
-
- while (i < len) {
- while ((i < len) && (copyMessage[i] != '\n')) i++;
- if (i < len) copyMessage[i] = 0;
- wxStaticText *mess = new wxStaticText(parent, -1, currentMessage);
-
-/*
- wxLayoutConstraints *c = new wxLayoutConstraints;
- c->left.SameAs (parent, wxLeft, 10);
- c->top.SameAs (lastWindow, wxBottom, 5);
- c->right.AsIs ();
- c->height.AsIs ();
-
- mess->SetConstraints(c);
-*/
- sizer->AddSizerChild(mess);
-
- messageList->Append(mess);
-
- currentMessage = copyMessage + i + 1;
- }
- delete[] copyMessage;
-}
+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)
- EVT_BUTTON(wxID_CANCEL, wxGenericMessageDialog::OnCancel)
+ 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()
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,
-#ifdef __WXMOTIF_
- wxSize(400, 300),
-#else
- wxDefaultSize,
-#endif
- wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
+wxGenericMessageDialog::wxGenericMessageDialog( wxWindow *parent,
+ const wxString& message,
+ const wxString& caption,
+ long style,
+ const wxPoint& pos)
+ : wxMessageDialogBase(GetParentForModalDialog(parent, style),
+ message,
+ caption,
+ style),
+ m_pos(pos)
{
- m_dialogStyle = style;
+ m_created = false;
+}
- wxBeginBusyCursor();
+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);
- wxSizer *topSizer = new wxSizer(this, wxSizerShrink);
- topSizer->SetBorder(10, 10);
+ wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
- wxRowColSizer *messageSizer = new wxRowColSizer(topSizer, wxSIZER_COLS, 100);
- messageSizer->SetName("messageSizer");
+ wxBoxSizer *icon_text = new wxBoxSizer( wxHORIZONTAL );
-// bool centre = ((style & wxCENTRE) == wxCENTRE);
+#if wxUSE_STATBMP
+ // 1) icon
+ if (m_dialogStyle & wxICON_MASK)
+ {
+ wxStaticBitmap *icon = new wxStaticBitmap
+ (
+ this,
+ wxID_ANY,
+ wxArtProvider::GetMessageBoxIcon(m_dialogStyle)
+ );
+ if ( wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA )
+ topsizer->Add( icon, 0, wxTOP|wxLEFT|wxRIGHT | wxALIGN_LEFT, 10 );
+ else
+ icon_text->Add(icon, wxSizerFlags().Top().Border(wxRIGHT, 20));
+ }
+#endif // wxUSE_STATBMP
- wxList messageList;
- wxSplitMessage2(message, &messageList, this, messageSizer);
+#if wxUSE_STATTEXT
+ // 2) text
- // Insert a spacer
- wxSpacingSizer *spacingSizer = new wxSpacingSizer(topSizer, wxBelow, messageSizer, 20);
+ wxBoxSizer * const textsizer = new wxBoxSizer(wxVERTICAL);
- wxRowColSizer *buttonSizer = new wxRowColSizer(topSizer, wxSIZER_ROWS);
- buttonSizer->SetName("buttonSizer");
- buttonSizer->SetSpacing(12,0);
+ // 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));
- // Specify constraints for the button sizer
- wxLayoutConstraints *c = new wxLayoutConstraints;
- c->width.AsIs ();
- c->height.AsIs ();
- c->top.Below (spacingSizer);
- c->centreX.SameAs (spacingSizer, wxCentreX);
- buttonSizer->SetConstraints(c);
+ lowerMessage = GetExtendedMessage();
+ }
+ else // no extended message
+ {
+ lowerMessage = GetMessage();
+ }
- wxButton *ok = (wxButton *) NULL;
- wxButton *cancel = (wxButton *) NULL;
- wxButton *yes = (wxButton *) NULL;
- wxButton *no = (wxButton *) NULL;
+ textsizer->Add(CreateTextSizer(lowerMessage));
- if (style & wxYES_NO) {
- yes = new wxButton(this, wxID_YES, _("Yes"), wxDefaultPosition, wxSize(75,-1) );
- no = new wxButton(this, wxID_NO, _("No"), wxDefaultPosition, wxSize(75,-1) );
+ icon_text->Add(textsizer, 0, wxALIGN_CENTER, 10);
+ topsizer->Add( icon_text, 1, wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif // wxUSE_STATTEXT
- buttonSizer->AddSizerChild(yes);
- buttonSizer->AddSizerChild(no);
- }
+ // 3) optional checkbox and detailed text
+ AddMessageDialogCheckBox( topsizer );
+ AddMessageDialogDetails( topsizer );
- if (style & wxOK) {
- ok = new wxButton(this, wxID_OK, _("OK"), wxDefaultPosition, wxSize(75,-1) );
- buttonSizer->AddSizerChild(ok);
- }
+ // 4) buttons
+ wxSizer *sizerBtn = CreateMsgDlgButtonSizer();
+ if ( sizerBtn )
+ topsizer->Add(sizerBtn, 0, wxEXPAND | wxALL, 10 );
- if (style & wxCANCEL) {
- cancel = new wxButton(this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize(75,-1) );
- buttonSizer->AddSizerChild(cancel);
- }
+ SetAutoLayout( true );
+ SetSizer( topsizer );
- if (ok)
+ topsizer->SetSizeHints( this );
+ topsizer->Fit( this );
+ wxSize size( GetSize() );
+ if (size.x < size.y*3/2)
{
- ok->SetDefault();
- ok->SetFocus();
+ size.x = size.y*3/2;
+ SetSize( size );
}
- else if (yes)
- {
- yes->SetDefault();
- yes->SetFocus();
- }
-
- Layout();
- Centre(wxBOTH);
- wxEndBusyCursor();
+ Centre( wxBOTH | wxCENTER_FRAME);
}
void wxGenericMessageDialog::OnYes(wxCommandEvent& WXUNUSED(event))
{
- EndModal(wxID_YES);
+ EndModal( wxID_YES );
}
void wxGenericMessageDialog::OnNo(wxCommandEvent& WXUNUSED(event))
{
- EndModal(wxID_NO);
+ 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
// only YES and NO are specified.
- if ( (m_dialogStyle & wxYES_NO) != wxYES_NO || (m_dialogStyle & wxCANCEL) )
- EndModal(wxID_CANCEL);
+ const long style = GetMessageDialogStyle();
+ if ( (style & wxYES_NO) != wxYES_NO || (style & wxCANCEL) )
+ {
+ EndModal( wxID_CANCEL );
+ }
}
+int wxGenericMessageDialog::ShowModal()
+{
+ WX_HOOK_MODAL_DIALOG();
+
+ if ( !m_created )
+ {
+ m_created = true;
+ DoCreateMsgdialog();
+ }
+
+ return wxMessageDialogBase::ShowModal();
+}
+#endif // wxUSE_MSGDLG
projects / wxWidgets.git / blobdiff