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:
@@ -13,31 +13,23 @@
|
||||
#ifndef _WX_MSGBOXDLG_H_
|
||||
#define _WX_MSGBOXDLG_H_
|
||||
|
||||
#include "wx/defs.h"
|
||||
#include "wx/dialog.h"
|
||||
|
||||
/*
|
||||
* Message box dialog
|
||||
*/
|
||||
|
||||
class WXDLLEXPORT wxMessageDialog : public wxDialog, public wxMessageDialogBase
|
||||
class WXDLLEXPORT wxMessageDialog : public wxMessageDialogBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxMessageDialog)
|
||||
public:
|
||||
wxMessageDialog( wxWindow* pParent
|
||||
,const wxString& rsMessage
|
||||
,const wxString& rsCaption = wxMessageBoxCaptionStr
|
||||
,long lStyle = wxOK|wxCENTRE
|
||||
,const wxPoint& rPos = wxDefaultPosition
|
||||
);
|
||||
,const wxPoint& WXUNUSED(rPos) = wxDefaultPosition
|
||||
)
|
||||
: wxMessageDialogBase(pParent, rsMessage, rsCaption, lStyle)
|
||||
{
|
||||
}
|
||||
|
||||
int ShowModal(void);
|
||||
|
||||
protected:
|
||||
wxString m_sCaption;
|
||||
wxString m_sMessage;
|
||||
wxWindow* m_pParent;
|
||||
DECLARE_DYNAMIC_CLASS(wxMessageDialog)
|
||||
}; // end of CLASS wxMessageDialog
|
||||
|
||||
#endif
|
||||
// _WX_MSGBOXDLG_H_
|
||||
#endif // _WX_MSGBOXDLG_H_
|
||||
|
Reference in New Issue
Block a user