From 4cf361b17655b4f2532e6accb26d4ee103fdf1bc Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 28 Jul 2014 07:24:59 +0000 Subject: [PATCH] ide: fixed to compile git-svn-id: svn://ultimatepp.org/upp/trunk@7546 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/Assist.cpp | 23 ----------------------- uppsrc/ide/Navigator.cpp | 29 +---------------------------- uppsrc/ide/ide.h | 4 ---- 3 files changed, 1 insertion(+), 55 deletions(-) diff --git a/uppsrc/ide/Assist.cpp b/uppsrc/ide/Assist.cpp index 2b84a0f2d..adbdc9951 100644 --- a/uppsrc/ide/Assist.cpp +++ b/uppsrc/ide/Assist.cpp @@ -45,29 +45,6 @@ AssistEditor::AssistEditor() navigatorframe.Left(navigatorpane, HorzLayoutZoom(140)); navigating = false; -/* - int cy = EditField::GetStdHeight(); - - int c2 = cy + 2; - int cx = 18; - - scopepane.Add(browser.search.HSizePos(0, 4 * cx + 2).TopPos(0, cy)); - for(int i = 0; i < 3; i++) - scopepane.Add(browser.rangebutton[i].RightPos((3 - i) * cx, cx).TopPos(0, cy)); - scopepane.Add(browser.sort.RightPos(0, cx).TopPos(0, cy)); - scopepane.Add(browser.scope.HSizePos().VSizePos(c2, 0)); - itempane.Add(browser.item.SizePos()); - scope_item.Vert(scopepane, itempane); - scope_item.SetPos(3000); - navigatorpane.Add(scope_item); - browser.scope.NoWantFocus(); - browser.scope.WhenLeftDouble = THISBACK(GotoBrowserScope); - browser.item.NoWantFocus(); - browser.item.WhenLeftClick = browser.item.WhenLeftDouble = THISBACK(BrowserGoto); - browser.WhenKeyItem = THISBACK(BrowserGotoNF); - browser.WhenClear = THISBACK(SyncCursor); - browser.NameStart(); -*/ int cy = search.GetMinSize().cy; navigatorpane.Add(search.TopPos(0, cy).HSizePos()); navigatorpane.Add(list.VSizePos(cy, 0).HSizePos()); diff --git a/uppsrc/ide/Navigator.cpp b/uppsrc/ide/Navigator.cpp index c1dde5dec..7438da501 100644 --- a/uppsrc/ide/Navigator.cpp +++ b/uppsrc/ide/Navigator.cpp @@ -64,39 +64,12 @@ void AssistEditor::NavigatorEnter() } } -void AssistEditor::BrowserGoto() -{ - BrowserGotoNF(); - SetFocus(); -} - -void AssistEditor::GotoBrowserScope() -{ -/* NAVI - if(browser.scope.IsCursor()) { - Value x = browser.scope.Get(2); - if(IsNumber(x)) { - int file = (int)x; - theide->EditFile(GetCppFile(file)); - return; - } - } - if(browser.item.GetCount()) { - browser.item.GoBegin(); - BrowserGoto(); - } -*/ -} - void AssistEditor::Navigator(bool nav) { navigator = nav; navigatorframe.Show(navigator && theide && !theide->IsEditorMode()); - if(IsNavigator()) { -// scope_item.Show(); NAVI -// browser.ClearSearch(); + if(IsNavigator()) SetFocus(); - } SyncNavigator(); SyncCursor(); } diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h index ba07bf77c..9168f881f 100644 --- a/uppsrc/ide/ide.h +++ b/uppsrc/ide/ide.h @@ -432,11 +432,7 @@ struct AssistEditor : CodeEditor { void Navigate(); void NavigatorEnter(); - void SyncNavigator(); - void GotoBrowserScope(); - void BrowserGoto(); - bool IsNavigator() const { return navigator; } void Navigator(bool navigator);