diff --git a/editor/editor_vs2005.vcproj b/editor/editor_vs2005.vcproj index e45df9b..8588668 100644 --- a/editor/editor_vs2005.vcproj +++ b/editor/editor_vs2005.vcproj @@ -194,6 +194,10 @@ > + + diff --git a/editor/syncdocument.cpp b/editor/syncdocument.cpp index b00a48f..143d900 100644 --- a/editor/syncdocument.cpp +++ b/editor/syncdocument.cpp @@ -128,7 +128,6 @@ bool SyncDocument::save(const std::string &fileName) if (0 != getTrackCount()) rootNode->appendChild(doc->createTextNode(_T("\n"))); doc->save(fileName.c_str()); - doc->Release(); savePointDelta = 0; savePointUnreachable = false; diff --git a/editor/trackview.cpp b/editor/trackview.cpp index 7045dbb..06dee73 100644 --- a/editor/trackview.cpp +++ b/editor/trackview.cpp @@ -331,7 +331,7 @@ void TrackView::paintTracks(HDC hdc, RECT rcTracks) { RECT rightMargin; rightMargin.top = getScreenY(0); - rightMargin.bottom = getScreenY(getRows()); + rightMargin.bottom = getScreenY(int(getRows())); rightMargin.left = getScreenX(getTrackCount()); rightMargin.right = rcTracks.right; FillRect( hdc, &rightMargin, GetSysColorBrush(COLOR_APPWORKSPACE)); @@ -339,7 +339,7 @@ void TrackView::paintTracks(HDC hdc, RECT rcTracks) { RECT bottomPadding; - bottomPadding.top = getScreenY(getRows()); + bottomPadding.top = getScreenY(int(getRows())); bottomPadding.bottom = rcTracks.bottom; bottomPadding.left = rcTracks.left; bottomPadding.right = rcTracks.right; @@ -512,7 +512,7 @@ void TrackView::setupScrollBars() si.nPos = editRow; si.nPage = windowRows; si.nMin = 0; - si.nMax = getRows() - 1 + windowRows - 1; + si.nMax = int(getRows()) - 1 + windowRows - 1; SetScrollInfo(hwnd, SB_VERT, &si, TRUE); si.fMask = SIF_POS | SIF_PAGE | SIF_RANGE | SIF_DISABLENOSCROLL; diff --git a/editor/trackview.h b/editor/trackview.h index c95994c..698d068 100644 --- a/editor/trackview.h +++ b/editor/trackview.h @@ -27,7 +27,7 @@ public: SyncDocument *getDocument() { return document; } void setRows(size_t rows); - int getRows() const + size_t getRows() const { if (NULL == document) return 0; return document->getRows();