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

EditField: fixed underline issue

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@5932 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-03-29 08:38:34 +00:00
parent f0fde76705
commit 2ede346178
3 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/CtrlCore/Ctrl.cpp
View file

@ -15,11 +15,7 @@ static bool StdDisplayErrorFn(const Value& e)
return false;
String s = GetErrorText(e);
#ifdef PLATFORM_WIN32
#ifdef PLATFORM_WINCE
MessageBox(NULL, ToSystemCharset(s), ToSystemCharset(GetExeTitle()), MB_OK | MB_ICONQUESTION);
#else
MessageBox(NULL, s, GetExeTitle(), MB_OK | MB_ICONQUESTION);
#endif
#else
fputs(String().Cat() << GetExeTitle() << ": " << s << '\n', stderr);
#endif

2
uppsrc/CtrlCore/Win32Proc.cpp
View file

@ -83,7 +83,7 @@ bool PassWindowsKey(int wParam);
LRESULT Ctrl::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) {
GuiLock __;
eventid++;
ASSERT_(!painting, "WindowProc invoked while in Paint routine");
ASSERT_(!painting || IsPanicMode(), "WindowProc invoked for " + Name() + " while in Paint routine");
// LLOG("Ctrl::WindowProc(" << message << ") in " << ::Name(this) << ", focus " << (void *)::GetFocus());
Ptr<Ctrl> _this = this;
HWND hwnd = GetHWND();

2
uppsrc/CtrlLib/EditField.cpp
View file

@ -326,7 +326,7 @@ void EditField::Paint(Draw& w)
w.DrawImage(x, (fcy - nullicon.GetHeight()) / 2, nullicon);
x += icx + 4;
}
Paints(w, x, fcy, txt, nullink, paper, nulltext.GetLength(), false, nullfont, false, false);
Paints(w, x, fcy, txt, nullink, paper, nulltext.GetLength(), false, nullfont, Null, false);
}
else {
const wchar *txt = text;