diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-16 17:10:47 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-16 17:10:47 +0100 |
| commit | 40b654453c2ce0b266f43c36f1b9a5d1705f983c (patch) | |
| tree | 061a8a6c655253334fcb7f5634fdcef0b98b1040 /src | |
| parent | 1f82930e73679d6aec5223caa255f564339a1a2a (diff) | |
| parent | c96637d181be25d58fb6935236e22cb1d6d10b3f (diff) | |
Merge master.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/kdm_dialog.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 4975146ec..4334fd446 100644 --- 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 int> (_type->GetClientData (_type->GetSelection())); + return (dcp::Formulation) reinterpret_cast<intptr_t> (_type->GetClientData (_type->GetSelection())); } void |