From 8dff23a58e31690d4695a925d4dbd1dc1d33dff6 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Thu, 4 Jun 2009 18:42:29 +0000 Subject: [PATCH] Fixed build. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4229 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs | 8 -------- src/Main/Base/Project/Src/Util/SDWindowsFormsHost.cs | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs index a76d9f9447..d6b444bb71 100644 --- a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs +++ b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs @@ -33,7 +33,6 @@ namespace ICSharpCode.SharpDevelop.Gui if (dockLayout == null) throw new ArgumentNullException("dockLayout"); - FocusManager.SetIsFocusScope(this, true); this.IsFloatingAllowed = true; this.dockLayout = dockLayout; viewContents = new ViewContentCollection(this); @@ -423,13 +422,6 @@ namespace ICSharpCode.SharpDevelop.Gui } } - protected override void FocusContent() - { - LoggingService.Debug("Trying to set focus to: " + FocusManager.GetFocusedElement(this)); - Keyboard.Focus(FocusManager.GetFocusedElement(this)); - LoggingService.Debug("Focus was set to: " + Keyboard.FocusedElement); - } - public override string ToString() { return "[AvalonWorkbenchWindow: " + this.Title + "]"; diff --git a/src/Main/Base/Project/Src/Util/SDWindowsFormsHost.cs b/src/Main/Base/Project/Src/Util/SDWindowsFormsHost.cs index e3db45a8ee..334428e0c4 100644 --- a/src/Main/Base/Project/Src/Util/SDWindowsFormsHost.cs +++ b/src/Main/Base/Project/Src/Util/SDWindowsFormsHost.cs @@ -59,6 +59,14 @@ namespace ICSharpCode.SharpDevelop.Gui } #endregion + public override string ToString() + { + if (ServiceObject != null) + return "[SDWindowsFormsHost " + Child + " for " + ServiceObject + "]"; + else + return "[SDWindowsFormsHost " + Child + "]"; + } + #region Service Object /// /// Gets/Sets the object that implements the IClipboardHandler, IUndoHandler etc. interfaces...