From 2ed55be1d998a1dbbb7c61cb2da8a76ca02be22b Mon Sep 17 00:00:00 2001 From: "tbogard%aol.net" Date: Thu, 13 Apr 2000 02:54:38 +0000 Subject: [PATCH] Implemented SetFocus. --- docshell/base/nsDocShell.cpp | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 3c9724f130d7..dba205e8af71 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -64,8 +64,8 @@ #include "nsIScriptError.h" static NS_DEFINE_IID(kDeviceContextCID, NS_DEVICE_CONTEXT_CID); -static NS_DEFINE_CID(kPlatformCharsetCID, NS_PLATFORMCHARSET_CID); -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); +static NS_DEFINE_CID(kPlatformCharsetCID, NS_PLATFORMCHARSET_CID); +static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); //***************************************************************************** //*** nsDocShell: Object Management @@ -1517,21 +1517,13 @@ NS_IMETHODIMP nsDocShell::GetMainWidget(nsIWidget** aMainWidget) NS_IMETHODIMP nsDocShell::SetFocus() { - //XXX First Check - /** - * Give the window focus. - */ + nsCOMPtr mainWidget; + GetMainWidget(getter_AddRefs(mainWidget)); - /* XXX implement + if(mainWidget) + mainWidget->SetFocus(); - if (mWindow) { - mWindow->SetFocus(); - } - - return NS_OK; - - */ - return NS_ERROR_FAILURE; + return NS_OK; } NS_IMETHODIMP nsDocShell::FocusAvailable(nsIBaseWindow* aCurrentFocus,