vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed some warnings

Browse Source
This commit is contained in:
Erik Faye-Lund 2008-10-14 00:27:27 +00:00
parent cef4af984d
commit df83f72336
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/trackview.cpp
View File

@ -83,9 +83,9 @@ int TrackView::getScreenY(int row)
return topMarginHeight + (row * fontHeight) - scrollPosY; return topMarginHeight + (row * fontHeight) - scrollPosY;
} }
int TrackView::getScreenX(int track) int TrackView::getScreenX(size_t track)
{ {
return leftMarginWidth + (track * trackWidth) - scrollPosX; return int(leftMarginWidth + (track * trackWidth)) - scrollPosX;
} }
LRESULT TrackView::onCreate() LRESULT TrackView::onCreate()
@ -519,7 +519,7 @@ void TrackView::setupScrollBars()
si.nPos = editTrack; si.nPos = editTrack;
si.nPage = windowTracks; si.nPage = windowTracks;
si.nMin = 0; si.nMin = 0;
si.nMax = getTrackCount() - 1 + windowTracks - 1; si.nMax = int(getTrackCount()) - 1 + windowTracks - 1;
SetScrollInfo(hwnd, SB_HORZ, &si, TRUE); SetScrollInfo(hwnd, SB_HORZ, &si, TRUE);
} }
@ -697,7 +697,7 @@ LRESULT TrackView::onHScroll(UINT sbCode, int /*newPos*/)
break; break;
case SB_RIGHT: case SB_RIGHT:
setEditTrack(getTrackCount() - 1); setEditTrack(int(getTrackCount()) - 1);
break; break;
case SB_LINELEFT: case SB_LINELEFT:

4
editor/trackview.h
View File

@ -46,7 +46,7 @@ public:
void selectAll() void selectAll()
{ {
selectStartTrack = 0; selectStartTrack = 0;
selectStopTrack = this->getTrackCount() - 1; selectStopTrack = int(this->getTrackCount()) - 1;
selectStartRow = 0; selectStartRow = 0;
selectStopRow = this->getRows() - 1; selectStopRow = this->getRows() - 1;
@ -133,7 +133,7 @@ private:
} }
int getScreenY(int row); int getScreenY(int row);
int getScreenX(int track); int getScreenX(size_t track);
size_t getTrackCount() const size_t getTrackCount() const
{ {