From 2ede346178bc872405a79f033fc2982cb29aad23 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 29 Mar 2013 08:38:34 +0000
Subject: [PATCH] EditField: fixed underline issue

git-svn-id: svn://ultimatepp.org/upp/trunk@5932 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/Ctrl.cpp      | 4 ----
 uppsrc/CtrlCore/Win32Proc.cpp | 2 +-
 uppsrc/CtrlLib/EditField.cpp  | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/uppsrc/CtrlCore/Ctrl.cpp b/uppsrc/CtrlCore/Ctrl.cpp
index e05974bfe..0fdc5c4c9 100644
--- a/uppsrc/CtrlCore/Ctrl.cpp
+++ b/uppsrc/CtrlCore/Ctrl.cpp
@@ -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
diff --git a/uppsrc/CtrlCore/Win32Proc.cpp b/uppsrc/CtrlCore/Win32Proc.cpp
index 332cc12ca..30ff0d5a1 100644
--- a/uppsrc/CtrlCore/Win32Proc.cpp
+++ b/uppsrc/CtrlCore/Win32Proc.cpp
@@ -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();
diff --git a/uppsrc/CtrlLib/EditField.cpp b/uppsrc/CtrlLib/EditField.cpp
index 323392cb5..01749267a 100644
--- a/uppsrc/CtrlLib/EditField.cpp
+++ b/uppsrc/CtrlLib/EditField.cpp
@@ -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;