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

.CtrlLib: ToolTip SColorInfoText fix, Core: DDUMP fix

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@2520 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2010-07-07 20:06:50 +00:00
parent 686dc4d02a
commit d114a3c7d1
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/CodeEditor/Highlight.cpp
View file

@ -328,9 +328,9 @@ void CodeEditor::InitKeywords()
};
static const char *upp_logs[] = {
"LOG", "LOGF", "DUMP", "DUMPC", "DUMPCC", "DUMPCCC", "DUMPM",
"LLOG", "LLOGF", "LDUMP", "LDUMPC", "LDUMPCC", "LDUMPCCC",
"DLOG", "DLOGF", "DDUMP", "DDUMPC", "DDUMPCC", "DDUMPCCC",
"RLOG", "RLOGF", "RDUMP", "RDUMPC", "RDUMPCC", "RDUMPCCC",
"LLOG", "LLOGF", "LDUMP", "LDUMPC", "LDUMPCC", "LDUMPCCC", "LDUMPM",
"DLOG", "DLOGF", "DDUMP", "DDUMPC", "DDUMPCC", "DDUMPCCC", "DDUMPM",
"RLOG", "RLOGF", "RDUMP", "RDUMPC", "RDUMPCC", "RDUMPCCC", "RDUMPM",
"LOGBEGIN", "LOGEND", "LOGBLOCK", "LOGHEXDUMP", "LOGSRCPOS",
"RLOGBEGIN", "RLOGEND", "RLOGBLOCK", "RLOGHEXDUMP", "RLOGSRCPOS", "RQUOTE",
"RTIMING", "TIMING", "LTIMING",

3
uppsrc/Core/Diag.h
View file

@ -124,7 +124,7 @@ inline void UnlockLog() {}
#define DLOG(x) LOG(x)
#define DDUMP(x) DUMP(x)
#define DDUMPC(x) DUMPC(x)
#define DDUMPM(x) DDUMPM(x)
#define DDUMPM(x) DUMPM(x)
#define DTIMING(x) TIMING(x)
#else
@ -183,6 +183,7 @@ struct DebugLogBlock
#define RLOGSRCPOS() UPP::LockLog(), UPP::VppLog() << __FILE__ << '#' << __LINE__ << UPP::EOL
#define RDUMP(a) UPP::LockLog(), UPP::VppLog() << #a << " = " << (a) << UPP::EOL, UPP::UnlockLog()
#define RDUMPC(c) UPP::LockLog(), UPP::DumpContainer(UPP::VppLog() << #c << ':' << UPP::EOL, (c)), UPP::UnlockLog()
#define RDUMPM(c) UPP::LockLog(), UPP::DumpMap(VppLog() << #c << ':' << UPP::EOL, (c)), UPP::UnlockLog()
// Crash support

2
uppsrc/CtrlLib/ToolTip.cpp
View file

@ -18,7 +18,7 @@ void ToolTip::Paint(Draw& w)
{
Size sz = GetSize();
w.DrawRect(sz, SColorInfo);
DrawSmartText(w, 2, 2, sz.cx - 4, text);
DrawSmartText(w, 2, 2, sz.cx - 4, text, StdFont(), SColorInfoText());
}
void ToolTip::PopUp(Ctrl *owner, Point p, bool effect)