OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f676afa
)
Fix compiler warning
author
sdottaka
<sdottaka@users.sourceforge.net>
Sun, 24 May 2015 08:33:16 +0000
(17:33 +0900)
committer
sdottaka
<sdottaka@users.sourceforge.net>
Sun, 24 May 2015 08:33:16 +0000
(17:33 +0900)
--HG--
branch : stable
Src/PropCodepage.cpp
patch
|
blob
|
history
diff --git
a/Src/PropCodepage.cpp
b/Src/PropCodepage.cpp
index
1759c54
..
3cf6ee6
100644
(file)
--- a/
Src/PropCodepage.cpp
+++ b/
Src/PropCodepage.cpp
@@
-178,7
+178,7
@@
void PropCodepage::OnDetectCodepage2()
void PropCodepage::OnDetectAutodetecttype()
{
- m_nAutodetectType =
m_comboAutodetectType.GetItemData(m_comboAutodetectType.GetCurSel());
+ m_nAutodetectType =
static_cast<int>(m_comboAutodetectType.GetItemData(m_comboAutodetectType.GetCurSel()));
}
void PropCodepage::OnCpUi()