github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: fixed to compile

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7546 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-07-28 07:24:59 +00:00
parent e3decb01be
commit 4cf361b176
3 changed files with 1 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

23
uppsrc/ide/Assist.cpp
View file

@ -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());

29
uppsrc/ide/Navigator.cpp
View file

@ -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();
}

4
uppsrc/ide/ide.h
View file

@ -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);