From c0cdb2ad99a1e2a6ade5ce76c91177a79258e669 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:10:11 +0200 Subject: 3.14 --- ui/msg_popup.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ui/msg_popup.cpp') diff --git a/ui/msg_popup.cpp b/ui/msg_popup.cpp index 0b6d3584..3dff49d2 100644 --- a/ui/msg_popup.cpp +++ b/ui/msg_popup.cpp @@ -6,7 +6,7 @@ // #include "msg_popup.h" #include "../library/resources.h" -#include "mouse_move_dlg.h" +#include "../shared/mouse_move_dlg.h" ErrorDlg::ErrorDlg(wxWindow* parentWindow, const int activeButtons, const wxString messageText, bool& ignoreNextErrors) : @@ -18,7 +18,7 @@ ErrorDlg::ErrorDlg(wxWindow* parentWindow, const int activeButtons, const wxStri this, m_bitmap10); //ownership passed to "this" #endif - m_bitmap10->SetBitmap(GlobalResources::getInstance().getImageByName(wxT("error"))); + m_bitmap10->SetBitmap(GlobalResources::instance().getImage(wxT("error"))); m_textCtrl8->SetValue(messageText); m_checkBoxIgnoreErrors->SetValue(ignoreNextErrors); @@ -82,7 +82,7 @@ WarningDlg::WarningDlg(wxWindow* parentWindow, int activeButtons, const wxStrin this, m_bitmap10); //ownership passed to "this" #endif - m_bitmap10->SetBitmap(GlobalResources::getInstance().getImageByName(wxT("warning"))); + m_bitmap10->SetBitmap(GlobalResources::instance().getImage(wxT("warning"))); m_textCtrl8->SetValue(messageText); m_checkBoxDontShowAgain->SetValue(dontShowAgain); @@ -144,7 +144,7 @@ QuestionDlg::QuestionDlg(wxWindow* parentWindow, int activeButtons, const wxStri this, m_bitmap10); //ownership passed to "this" #endif - m_bitmap10->SetBitmap(GlobalResources::getInstance().getImageByName(wxT("question"))); + m_bitmap10->SetBitmap(GlobalResources::instance().getImage(wxT("question"))); m_textCtrl8->SetValue(messageText); if (dontShowAgain) m_checkBoxDontAskAgain->SetValue(*dontShowAgain); -- cgit