1. Derive wxMessageDialogBase from wxDialog (why did we use multiple
inheritance here?), moved more wxMessageDialog fields into the base class 2. Added functions to set the text of message box buttons (patch 1700393, currently only implemented for wxMac) 3. Added wxMessageDialog::SetMessage() and SetExtendedMessage() and implemented them for wxMac (part of the patch), wxGTK 2.4+ and in a generic way for everybody else 4. Allow changing the dialog attributes between creating and showing it, for this the real dialog creation is now done on in ShowModal() in all ports git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -33,18 +33,6 @@
|
||||
|
||||
IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
|
||||
|
||||
wxMessageDialog::wxMessageDialog(wxWindow *parent,
|
||||
const wxString& message,
|
||||
const wxString& caption,
|
||||
long style,
|
||||
const wxPoint& WXUNUSED(pos))
|
||||
{
|
||||
m_caption = caption;
|
||||
m_message = message;
|
||||
m_parent = parent;
|
||||
SetMessageDialogStyle(style);
|
||||
}
|
||||
|
||||
int wxMessageDialog::ShowModal()
|
||||
{
|
||||
if ( !wxTheApp->GetTopWindow() )
|
||||
@@ -110,7 +98,7 @@ int wxMessageDialog::ShowModal()
|
||||
// per MSDN documentation for MessageBox() we can prefix the message with 2
|
||||
// right-to-left mark characters to tell the function to use RTL layout
|
||||
// (unfortunately this only works in Unicode builds)
|
||||
wxString message = m_message;
|
||||
wxString message = GetFullMessage();
|
||||
#if wxUSE_UNICODE
|
||||
if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
|
||||
{
|
||||
|
Reference in New Issue
Block a user