From 8bf668665b107469086f16cb8ad23e47d479d2b4 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:14:37 +0200 Subject: 4.0 --- ui/msg_popup.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'ui/msg_popup.cpp') diff --git a/ui/msg_popup.cpp b/ui/msg_popup.cpp index 900ab683..9e0e0111 100644 --- a/ui/msg_popup.cpp +++ b/ui/msg_popup.cpp @@ -36,7 +36,7 @@ ErrorDlg::ErrorDlg(wxWindow* parentWindow, const int activeButtons, const wxStri new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this" #endif - m_bitmap10->SetBitmap(GlobalResources::instance().getImage(wxT("error"))); + m_bitmap10->SetBitmap(GlobalResources::getImage(wxT("error"))); m_textCtrl8->SetValue(messageText); m_checkBoxIgnoreErrors->SetValue(ignoreNextErrors); @@ -120,7 +120,7 @@ WarningDlg::WarningDlg(wxWindow* parentWindow, int activeButtons, const wxStrin new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this" #endif - m_bitmap10->SetBitmap(GlobalResources::instance().getImage(wxT("warning"))); + m_bitmap10->SetBitmap(GlobalResources::getImage(wxT("warning"))); m_textCtrl8->SetValue(messageText); m_checkBoxDontShowAgain->SetValue(dontShowAgain); @@ -190,6 +190,7 @@ private: void OnCancel(wxCommandEvent& event); void OnYes(wxCommandEvent& event); void OnNo(wxCommandEvent& event); + void OnCheckBoxDontShowAgain(wxCommandEvent& event); bool* dontShowAgain; //optional }; @@ -203,7 +204,7 @@ QuestionDlg::QuestionDlg(wxWindow* parentWindow, int activeButtons, const wxStri new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this" #endif - m_bitmap10->SetBitmap(GlobalResources::instance().getImage(wxT("question"))); + m_bitmap10->SetBitmap(GlobalResources::getImage(wxT("question"))); m_textCtrl8->SetValue(messageText); if (dontShowAgain) m_checkBoxDontAskAgain->SetValue(*dontShowAgain); @@ -258,6 +259,12 @@ void QuestionDlg::OnNo(wxCommandEvent& event) EndModal(ReturnQuestionDlg::BUTTON_NO); } +void QuestionDlg::OnCheckBoxDontShowAgain(wxCommandEvent& event) +{ + event.Skip(); +} + + ReturnQuestionDlg::ButtonPressed zen::showQuestionDlg(int activeButtons, const wxString& messageText, bool* dontShowAgain) { -- cgit