haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a compil issue with too old compilers

This commit is contained in:
jean-pierre charras 2018-02-22 20:46:43 +01:00
parent 80f36ce264
commit 43cb1b7bc7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/confirm.cpp
View File

@ -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<TYPE, wxString> stdTitle = {
const std::unordered_map<int, wxString> stdTitle = {
{ KD_NONE, _( "Message" ) }, { KD_INFO, _( "Information" ) }, { KD_QUESTION, _( "Question" ) },
{ KD_WARNING, _( "Warning" ) }, { KD_ERROR, _( "Error" ) }
};
const std::unordered_map<TYPE, wxArtID> icons = {
const std::unordered_map<int, wxArtID> icons = {
{ KD_INFO, wxART_INFORMATION }, { KD_QUESTION, wxART_QUESTION },
{ KD_WARNING, wxART_WARNING }, { KD_ERROR, wxART_ERROR }
};

6
include/confirm.h
View File

@ -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;