github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-23 14:22:41 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Find&Replace position new after scrollbars #807

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7500 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-07-11 08:56:24 +00:00
parent 03f19c7868
commit 54afaf3c4e
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CodeEditor/FindReplace.cpp
View file

@ -475,7 +475,7 @@ void CodeEditor::OpenNormalFindReplace(bool replace)
findreplace.next <<= THISBACK(DoFind);
findreplace.close <<= THISBACK(CloseFindReplace);
if(!findreplace.IsOpen())
AddFrame(findreplace);
InsertFrame(FindFrame(sb), findreplace);
WhenOpenFindReplace();
IncrementalFind();
}

2
uppsrc/CodeEditor/init
View file

@ -1,7 +1,7 @@
#ifndef _CodeEditor_icpp_init_stub
#define _CodeEditor_icpp_init_stub
#include "CtrlLib/init"
#define BLITZ_INDEX__ Fa19bf999ba2b201492446aa335bd578e
#define BLITZ_INDEX__ Fd579c6629af5990c016d4bd1dc2b4c20
#include "CRegister.icpp"
#undef BLITZ_INDEX__
#endif

3
uppsrc/CppBase/Parser.cpp
View file

@ -681,7 +681,7 @@ Array<Parser::Decl> Parser::Declaration0(bool l0, bool more)
break;
}
Qualifier();
if(l0)
if(l0) {
if(lex == tk_SKYLARK && lex[1] == '(' && lex.IsId(2)) {
++lex;
++lex;
@ -715,6 +715,7 @@ Array<Parser::Decl> Parser::Declaration0(bool l0, bool more)
Key(')');
return r;
}
}
bool isdestructor = Key('~');
if(l0 && context.typenames.Find(lex) >= 0 && lex[1] == '(' && lex.IsId()) {
Decl& a = r.Add();

2
uppsrc/CtrlLib/MenuBar.cpp
View file

@ -280,7 +280,7 @@ bool MenuKeyHook(Ctrl *ctrl, dword key, int count)
bool MenuMouseHook(Ctrl *ctrl, bool inframe, int event, Point p,
int zdelta, dword keyflags)
{
if(event & (Ctrl::MOUSEWHEEL, Ctrl::DOWN, Ctrl::UP))
if(event & (Ctrl::MOUSEWHEEL|Ctrl::DOWN|Ctrl::UP))
s_doaltkey = false;
return false;
}