From fa647184c1956d41ece1c3aa051588bba36e6e46 Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 11 Jul 2019 21:33:21 +0000 Subject: [PATCH] ide: fixed to compile git-svn-id: svn://ultimatepp.org/upp/trunk@13486 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlCore/GtkEvent.cpp | 2 +- uppsrc/TextDiffCtrl/PatchDiff.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uppsrc/CtrlCore/GtkEvent.cpp b/uppsrc/CtrlCore/GtkEvent.cpp index 5ba8f3edf..9c3cc30af 100644 --- a/uppsrc/CtrlCore/GtkEvent.cpp +++ b/uppsrc/CtrlCore/GtkEvent.cpp @@ -73,7 +73,7 @@ Ctrl *Ctrl::GetTopCtrlFromId(int id) int q = FindId(id); if(q >= 0) { Ctrl *p = wins[q].ctrl; - if(p && p->top) + if(p && p->top)50 return p; } return NULL; diff --git a/uppsrc/TextDiffCtrl/PatchDiff.cpp b/uppsrc/TextDiffCtrl/PatchDiff.cpp index 0b097548d..813756f50 100644 --- a/uppsrc/TextDiffCtrl/PatchDiff.cpp +++ b/uppsrc/TextDiffCtrl/PatchDiff.cpp @@ -128,7 +128,7 @@ bool PatchDiff::Open(const char *patch_path, const Vector& target_dirs) int PatchDiff::GetFileIndex() const { int ii = files.GetCursor(); - return ii >= 0 ? files.Get(ii).data : -1; + return ii >= 0 ? (int)files.Get(ii).data : -1; } void PatchDiff::File()