From f322b58d410d5f024c4bf61a90dfbbc652a149f8 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 9 Feb 2014 17:32:50 +0000
Subject: [PATCH] Turtle: Fixed initial focus issue #677

git-svn-id: svn://ultimatepp.org/upp/trunk@6891 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/CtrlKbd.cpp   | 2 +-
 uppsrc/CtrlCore/TopWindow.cpp | 2 +-
 uppsrc/Turtle/Top.cpp         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/uppsrc/CtrlCore/CtrlKbd.cpp b/uppsrc/CtrlCore/CtrlKbd.cpp
index 06e856d76..da034d404 100644
--- a/uppsrc/CtrlCore/CtrlKbd.cpp
+++ b/uppsrc/CtrlCore/CtrlKbd.cpp
@@ -158,7 +158,7 @@ void Ctrl::DoKillFocus(Ptr<Ctrl> pfocusCtrl, Ptr<Ctrl> nfocusCtrl)
 	GuiLock __;
 	if(pfocusCtrl && !pfocusCtrl->destroying) {
 		pfocusCtrl->StateH(FOCUS);
-		LLOG("LostFocus: " << Desc(pfocusCtrl));
+		LLOG("LostFocus: " << Name(pfocusCtrl));
 		pfocusCtrl->LostFocus();
 	}
 	if(pfocusCtrl && pfocusCtrl->parent && !pfocusCtrl->parent->destroying)
diff --git a/uppsrc/CtrlCore/TopWindow.cpp b/uppsrc/CtrlCore/TopWindow.cpp
index f7b699eef..b529a9b1f 100644
--- a/uppsrc/CtrlCore/TopWindow.cpp
+++ b/uppsrc/CtrlCore/TopWindow.cpp
@@ -2,7 +2,7 @@
 
 NAMESPACE_UPP
 
-#define LLOG(x)  //  DLOG(x)
+#define LLOG(x)   // DLOG(x)
 
 String TopWindow::GetDesc() const
 {
diff --git a/uppsrc/Turtle/Top.cpp b/uppsrc/Turtle/Top.cpp
index 7c2cdbca8..afe02845a 100644
--- a/uppsrc/Turtle/Top.cpp
+++ b/uppsrc/Turtle/Top.cpp
@@ -84,6 +84,7 @@ void TopWindow::Open(Ctrl *owner)
 	popup = false;
 	SetRect(frame->GetClient());
 	SyncCaption();
+	PlaceFocus();
 	if(state == MAXIMIZED)
 		frame->Maximize();
 }