From 43cb1b7bc75a1f3b2f20385d88524a1468575db1 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Thu, 22 Feb 2018 20:46:43 +0100 Subject: [PATCH] Fix a compil issue with too old compilers --- common/confirm.cpp | 6 +++--- include/confirm.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/confirm.cpp b/common/confirm.cpp index 1fb6a22aec..3081134aec 100644 --- a/common/confirm.cpp +++ b/common/confirm.cpp @@ -65,16 +65,16 @@ KI_DIALOG::KI_DIALOG( wxWindow* aParent, const wxString& aMessage ) } -KI_DIALOG& KI_DIALOG::Type( TYPE aType ) +KI_DIALOG& KI_DIALOG::Type( KD_TYPE aType ) { m_type = aType; - const std::unordered_map stdTitle = { + const std::unordered_map stdTitle = { { KD_NONE, _( "Message" ) }, { KD_INFO, _( "Information" ) }, { KD_QUESTION, _( "Question" ) }, { KD_WARNING, _( "Warning" ) }, { KD_ERROR, _( "Error" ) } }; - const std::unordered_map icons = { + const std::unordered_map icons = { { KD_INFO, wxART_INFORMATION }, { KD_QUESTION, wxART_QUESTION }, { KD_WARNING, wxART_WARNING }, { KD_ERROR, wxART_ERROR } }; diff --git a/include/confirm.h b/include/confirm.h index 09fce913ca..998b8ed9c0 100644 --- a/include/confirm.h +++ b/include/confirm.h @@ -48,12 +48,12 @@ class KI_DIALOG : wxDialog { public: ///> Dialog type. Selects appropriate icon and default dialog title - enum TYPE { KD_NONE, KD_INFO, KD_QUESTION, KD_WARNING, KD_ERROR }; + enum KD_TYPE { KD_NONE, KD_INFO, KD_QUESTION, KD_WARNING, KD_ERROR }; KI_DIALOG( wxWindow* aParent, const wxString& aMessage ); ///> Sets the dialog type - KI_DIALOG& Type( TYPE aType ); + KI_DIALOG& Type( KD_TYPE aType ); ///> Sets the dialog title KI_DIALOG& Title( const wxString& aTitle ); @@ -80,7 +80,7 @@ protected: wxString m_message; ///> Dialog type - TYPE m_type; + KD_TYPE m_type; ///> Custom title requested, if any was requested wxString m_customTitle;