projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9bf304a
)
Try to fix win32 build.
author
Carl Hetherington
<cth@carlh.net>
Mon, 6 May 2013 14:14:12 +0000
(15:14 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 6 May 2013 14:14:12 +0000
(15:14 +0100)
src/wx/timeline.cc
patch
|
blob
|
history
diff --git
a/src/wx/timeline.cc
b/src/wx/timeline.cc
index 52707e45c725de3bbd3ffbc661eb445cef4137aa..7e0ecf27e5e93bfa752bdc01ccb5ef2041c84f56 100644
(file)
--- a/
src/wx/timeline.cc
+++ b/
src/wx/timeline.cc
@@
-42,7
+42,7
@@
Timeline::Timeline (wxWindow* parent, shared_ptr<Playlist> pl)
if (pl->audio_from() == Playlist::AUDIO_FFMPEG) {
SetMinSize (wxSize (640, _track_height * 2 + 96));
} else {
- SetMinSize (wxSize (640, _track_height * (max (
1UL
, pl->audio().size()) + 1) + 96));
+ SetMinSize (wxSize (640, _track_height * (max (
size_t (1)
, pl->audio().size()) + 1) + 96));
}
pl->Changed.connect (bind (&Timeline::playlist_changed, this));