Browse Source

Fixed build

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3606 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
commit
9815697f23
  1. 10
      src/Main/Base/Project/Src/TextEditor/ClipboardHandling.cs

10
src/Main/Base/Project/Src/TextEditor/ClipboardHandling.cs

@ -22,7 +22,13 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor
public static void Initialize() public static void Initialize()
{ {
ICSharpCode.TextEditor.TextAreaClipboardHandler.GetClipboardContainsText = GetClipboardContainsText; ICSharpCode.TextEditor.TextAreaClipboardHandler.GetClipboardContainsText = GetClipboardContainsText;
WorkbenchSingleton.MainForm.Activated += WorkbenchSingleton_MainForm_Activated; if (WorkbenchSingleton.MainForm != null) {
WorkbenchSingleton.MainForm.Activated += WorkbenchSingleton_MainForm_Activated;
} else {
WorkbenchSingleton.WorkbenchCreated += delegate {
WorkbenchSingleton.MainForm.Activated += WorkbenchSingleton_MainForm_Activated;
};
}
} }
static void WorkbenchSingleton_MainForm_Activated(object sender, EventArgs e) static void WorkbenchSingleton_MainForm_Activated(object sender, EventArgs e)
@ -35,7 +41,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor
public static bool GetClipboardContainsText() public static bool GetClipboardContainsText()
{ {
WorkbenchSingleton.DebugAssertMainThread(); WorkbenchSingleton.DebugAssertMainThread();
if (WorkbenchSingleton.Workbench.IsActiveWindow) { if (WorkbenchSingleton.Workbench != null && WorkbenchSingleton.Workbench.IsActiveWindow) {
UpdateClipboardContainsText(); UpdateClipboardContainsText();
} }
return clipboardContainsText; return clipboardContainsText;

Loading…
Cancel
Save