diff options
| author | Carlos Alberto Cortez <calberto.cortez@gmail.com> | 2011-09-29 01:58:47 +0400 |
|---|---|---|
| committer | Carlos Alberto Cortez <calberto.cortez@gmail.com> | 2011-09-29 02:13:30 +0400 |
| commit | 3d393d5046b8dc486aefb62402254c36e7b8c3d8 (patch) | |
| tree | d7cfdead649d8474f526d90ea9fae878ac2b195f /main/src/addins/WindowsPlatform | |
| parent | eaeaa1179c385b77cb05a8612ce8140422aeb4f4 (diff) | |
[WindowsPlatform] Don't run the MD's pending events from the winforms thread.
Remove the calls from the OpenFileDialogEx, as we are not going
to use them anymore there, and comment them for now in the WinformsRoot
class, as we may need it them here in the future (whenever
MD's Main method is marked with STAThreadAttribute).
Diffstat (limited to 'main/src/addins/WindowsPlatform')
| -rw-r--r-- | main/src/addins/WindowsPlatform/Dialogs/OpenFileDialogEx.cs | 5 | ||||
| -rw-r--r-- | main/src/addins/WindowsPlatform/Dialogs/WinFormsRoot.cs | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/main/src/addins/WindowsPlatform/Dialogs/OpenFileDialogEx.cs b/main/src/addins/WindowsPlatform/Dialogs/OpenFileDialogEx.cs index 73f0560ff0..c28f22fa2d 100644 --- a/main/src/addins/WindowsPlatform/Dialogs/OpenFileDialogEx.cs +++ b/main/src/addins/WindowsPlatform/Dialogs/OpenFileDialogEx.cs @@ -437,11 +437,6 @@ namespace CustomControls.Controls }
}
break;
- // Make the Winforms message queue and the MD one collaborate
- case (int) Msg.WM_WINDOWPOSCHANGED:
- case (int) Msg.WM_ENTERIDLE:
- MonoDevelop.Ide.DispatchService.RunPendingEvents ();
- break;
case (int) Msg.WM_IME_NOTIFY:
if (m.WParam == (IntPtr) ImeNotify.IMN_CLOSESTATUSWINDOW)
{
diff --git a/main/src/addins/WindowsPlatform/Dialogs/WinFormsRoot.cs b/main/src/addins/WindowsPlatform/Dialogs/WinFormsRoot.cs index 555a5ef732..d8033e3760 100644 --- a/main/src/addins/WindowsPlatform/Dialogs/WinFormsRoot.cs +++ b/main/src/addins/WindowsPlatform/Dialogs/WinFormsRoot.cs @@ -66,13 +66,18 @@ namespace MonoDevelop.Platform }
protected override void WndProc (ref Message m)
- {
+ {
+ /* Disable the handling of the pending events of the
+ * MD's UI thread, as we are running them in a separated thread now,
+ * but leave them here since we may need them when/if the MD's Main
+ * method is marked with the STAThread attribute.
switch (m.Msg) {
case (int) Msg.WM_ENTERIDLE:
case (int) Msg.WM_WINDOWPOSCHANGED:
MonoDevelop.Ide.DispatchService.RunPendingEvents ();
break;
}
+ */
base.WndProc (ref m);
}
|