Implement AxHost.InvalidActiveXStateException

[mono.git] / mcs / class / Managed.Windows.Forms / System.Windows.Forms.X11Internal / XplatUIX11-new.cs

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/XplatUIX11-new.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/XplatUIX11-new.cs
index 490f65a66c59ad5f4eb84a6cfc755dd5483e30d0..ef259b767aca23d4a8ee35079194fba93debe999 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/XplatUIX11-new.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/XplatUIX11-new.cs
@@ -150,7 +150,7 @@ namespace System.Windows.Forms.X11Internal {
 
 
                #region Public Properties
-               internal override int Caption {
+               internal override int CaptionHeight {
                        get { return 19; }
                }
 
@@ -192,10 +192,6 @@ namespace System.Windows.Forms.X11Internal {
                        }
                }
 
-               internal override Size MinimizedWindowSize {
-                       get { return new Size(1, 1); }
-               } 
-
                internal override Size MinimizedWindowSpacingSize {
                        get { return new Size(1, 1); }
                } 
@@ -204,10 +200,6 @@ namespace System.Windows.Forms.X11Internal {
                        get { return new Size(1, 1); }
                } 
 
-               internal override Size MinWindowTrackSize {
-                       get { return new Size(1, 1); }
-               }
-
                internal override Keys ModifierKeys {
                        get { return display.ModifierKeys; }
                }
@@ -252,7 +244,13 @@ namespace System.Windows.Forms.X11Internal {
                #endregion      // Public properties
 
                #region Public Static Methods
-               internal override IntPtr InitializeDriver()
+               internal override void RaiseIdle (EventArgs e)
+               {
+                       X11ThreadQueue queue = ThreadQueue (Thread.CurrentThread);
+                       queue.OnIdle (e);
+               }
+
+               internal override IntPtr InitializeDriver ()
                {
                        lock (this) {
                                if (display == null)
@@ -519,6 +517,11 @@ namespace System.Windows.Forms.X11Internal {
                        return IntPtr.Zero;
                }
 
+               // This is a nop on win32 and x11
+               internal override IntPtr GetPreviousWindow(IntPtr handle) {
+                       return handle;
+               }
+
                internal override void GetCursorPos (IntPtr handle, out int x, out int y)
                {
                        display.GetCursorPos ((X11Hwnd)Hwnd.ObjectFromHandle(handle),
@@ -678,14 +681,14 @@ namespace System.Windows.Forms.X11Internal {
                        display.OverrideCursor = cursor;
                }
 
-               internal override PaintEventArgs PaintEventStart (IntPtr handle, bool client)
+               internal override PaintEventArgs PaintEventStart (ref Message m, IntPtr handle, bool client)
                {
-                       return display.PaintEventStart (handle, client);
+                       return display.PaintEventStart (ref m, handle, client);
                }
 
-               internal override void PaintEventEnd (IntPtr handle, bool client)
+               internal override void PaintEventEnd (ref Message m, IntPtr handle, bool client)
                {
-                       display.PaintEventEnd (handle, client);
+                       display.PaintEventEnd (ref m, handle, client);
                }
 
 
@@ -1012,7 +1015,6 @@ namespace System.Windows.Forms.X11Internal {
                        display.SystrayRemove (handle, ref tt);
                }
 
-#if NET_2_0
                NotifyIcon.BalloonWindow balloon_window;
 
                internal override void SystrayBalloon(IntPtr handle, int timeout, string title, string text, ToolTipIcon icon)
@@ -1035,7 +1037,6 @@ namespace System.Windows.Forms.X11Internal {
                        
                        SendMessage(handle, Msg.WM_USER, IntPtr.Zero, (IntPtr) Msg.NIN_BALLOONSHOW);    
                }
-#endif
 
                internal override bool Text (IntPtr handle, string text)
                {