From b8f13e45be884dc12884ebe8f3dcd9eecb23a106 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:20:29 +0200 Subject: 5.5 --- ui/msg_popup.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'ui/msg_popup.h') diff --git a/ui/msg_popup.h b/ui/msg_popup.h index 19a3c84f..48a4e8cb 100644 --- a/ui/msg_popup.h +++ b/ui/msg_popup.h @@ -21,19 +21,30 @@ struct ReturnErrorDlg { BUTTON_IGNORE = 1, BUTTON_RETRY = 2, - BUTTON_ABORT = 4 + BUTTON_CANCEL = 4 }; }; ReturnErrorDlg::ButtonPressed showErrorDlg(wxWindow* parent, int activeButtons, const wxString& messageText, bool* ignoreNextErrors); //ignoreNextErrors may be nullptr +struct ReturnFatalErrorDlg +{ + enum ButtonPressed + { + BUTTON_IGNORE = ReturnErrorDlg::BUTTON_IGNORE, + BUTTON_CANCEL = ReturnErrorDlg::BUTTON_CANCEL + }; +}; +ReturnFatalErrorDlg::ButtonPressed showFatalErrorDlg(wxWindow* parent, int activeButtons, const wxString& messageText, bool* ignoreNextErrors); //ignoreNextErrors may be nullptr + + struct ReturnWarningDlg { enum ButtonPressed { BUTTON_IGNORE = 1, BUTTON_SWITCH = 2, - BUTTON_ABORT = 4 + BUTTON_CANCEL = 4 }; }; ReturnWarningDlg::ButtonPressed showWarningDlg(wxWindow* parent, int activeButtons, const wxString& messageText, bool& dontShowAgain); @@ -57,7 +68,13 @@ struct CheckBox bool& value_; //in/out }; -ReturnQuestionDlg::ButtonPressed showQuestionDlg(wxWindow* parent, int activeButtons, const wxString& messageText, CheckBox* checkbox = nullptr); +ReturnQuestionDlg::ButtonPressed showQuestionDlg(wxWindow* parent, + int activeButtons, + const wxString& messageText, + const wxString& caption = wxString(), + const wxString& labelYes = wxString(), //overwrite default "Yes, No" labels + const wxString& labelNo = wxString(), // + CheckBox* checkbox = nullptr); } #endif // MESSAGEPOPUP_H_INCLUDED -- cgit