projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
1f82930
)
Merge master.
author
Carl Hetherington
<cth@carlh.net>
Wed, 16 Jul 2014 16:10:47 +0000
(17:10 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 16 Jul 2014 16:10:47 +0000
(17:10 +0100)
src/wx/kdm_dialog.cc
patch
|
blob
|
history
diff --git
a/src/wx/kdm_dialog.cc
b/src/wx/kdm_dialog.cc
index 4975146ec87a998e5c6fa2ccbe0f3a8e6103e1c5..4334fd446ce99ae7dad7665fc4dc471072f2903c 100644
(file)
--- a/
src/wx/kdm_dialog.cc
+++ b/
src/wx/kdm_dialog.cc
@@
-493,7
+493,7
@@
KDMDialog::write_to () const
dcp::Formulation
KDMDialog::formulation () const
{
- return (dcp::Formulation) reinterpret_cast<
long in
t> (_type->GetClientData (_type->GetSelection()));
+ return (dcp::Formulation) reinterpret_cast<
intptr_
t> (_type->GetClientData (_type->GetSelection()));
}
void