2006-11-28 Chris Toshok <toshok@ximian.com>

	* X11Hwnd.cs, XplatUIX11-new.cs: remove spew, and ^M's.

svn path=/trunk/mcs/; revision=68602

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
index bf9c675a46e48d2c8561e4b4e7affa0f3601fc2d..a95f2e6b911f1ded58c16600f79caec630d159ab 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-28  Chris Toshok  <toshok@ximian.com>
+
+       * X11Hwnd.cs, XplatUIX11-new.cs: remove spew, and ^M's.
+
 2006-11-28  Rolf Bjarne Kvinge <RKvinge@novell.com>
        
        * XplatUIX11-new.cs:

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/X11Hwnd.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/X11Hwnd.cs
index b2ef606599f14e21b77f743e758095cf01860020..fb88bae4ff0ab46a6d2d51960620f718debc156e 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/X11Hwnd.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/X11Hwnd.cs
@@ -266,16 +266,12 @@ namespace System.Windows.Forms.X11Internal {
                        int     dest_y_return;
                        IntPtr  child;
 
-                       Console.Write ("MenuToScreen ({0}, {1}) =>", x, y);
-
                        Xlib.XTranslateCoordinates (display.Handle,
                                                    WholeWindow, display.RootWindow.Handle,
                                                    x, y, out dest_x_return, out dest_y_return, out child);
 
                        x = dest_x_return;
                        y = dest_y_return;
-
-                       Console.WriteLine ("({0}, {1})", x, y);
                }
 
                public virtual void PropertyChanged (XEvent xevent)
@@ -794,13 +790,13 @@ namespace System.Windows.Forms.X11Internal {
                        PerformNCCalc ();
                        display.SendMessage (Handle, Msg.WM_WINDOWPOSCHANGED, IntPtr.Zero, IntPtr.Zero);
                        InvalidateNC ();
-               }\r
-\r
-               [MonoTODO]\r
-               public void RequestAdditionalWM_NCMessages (bool hover, bool leave)\r
-               {\r
-                       // Missing messages won't crash anything so just don't generate them for the moment.\r
-                       // throw new NotImplementedException( );\r
+               }
+
+               [MonoTODO]
+               public void RequestAdditionalWM_NCMessages (bool hover, bool leave)
+               {
+                       // Missing messages won't crash anything so just don't generate them for the moment.
+                       // throw new NotImplementedException( );
                }
                
                public void FrameExtents (out int left, out int top)
@@ -1081,15 +1077,12 @@ namespace System.Windows.Forms.X11Internal {
                        int     dest_y_return;
                        IntPtr  child;
 
-                       Console.Write ("ClientToScreen ({0}, {1}) =>", x, y);
                        Xlib.XTranslateCoordinates (display.Handle,
                                                    ClientWindow, display.RootWindow.Handle,
                                                    x, y, out dest_x_return, out dest_y_return, out child);
 
                        x = dest_x_return;
                        y = dest_y_return;
-
-                       Console.WriteLine ("({0}, {1})", x, y);
                }
 
                public void ScreenToClient (ref int x, ref int y)
@@ -1098,15 +1091,12 @@ namespace System.Windows.Forms.X11Internal {
                        int     dest_y_return;
                        IntPtr  child;
 
-                       Console.Write ("ScreenToClient ({0}, {1}) =>", x, y);
                        Xlib.XTranslateCoordinates (display.Handle,
                                                    display.RootWindow.Handle, ClientWindow,
                                                    x, y, out dest_x_return, out dest_y_return, out child);
 
                        x = dest_x_return;
                        y = dest_y_return;
-
-                       Console.WriteLine ("({0}, {1})", x, y);
                }
 
 
@@ -1116,22 +1106,19 @@ namespace System.Windows.Forms.X11Internal {
                        int     dest_y_return;
                        IntPtr  child;
 
-                       Console.Write ("ScreenToMenu ({0}, {1}) =>", x, y);
-
-                       Console.WriteLine ("x,y = {0},{1}", X, Y);
-
                        Xlib.XTranslateCoordinates (display.Handle,
                                                    display.RootWindow.Handle, WholeWindow,
                                                    x, y, out dest_x_return, out dest_y_return, out child);
 
                        x = dest_x_return;
                        y = dest_y_return;
-
-                       Console.WriteLine ("({0}, {1})", x, y);
                }
 
                public void ScrollWindow (Rectangle area, int XAmount, int YAmount, bool with_children)
                {
+                       try {
+                       Queue.Lock ();
+
                        IntPtr          gc;
                        XGCValues       gc_values;
 
@@ -1210,6 +1197,10 @@ namespace System.Windows.Forms.X11Internal {
                        }
 
                        Xlib.XFreeGC (display.Handle, gc);
+                       }
+                       finally {
+                               Queue.Unlock ();
+                       }
                }
 
 

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 5279120717966bcab7b454c3641fd69ecc8eff8c..b3e6e77bc4a5a31711de2b06a5519e709b7ce0ad 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
@@ -687,15 +687,15 @@ namespace System.Windows.Forms.X11Internal {
                {
                        display.Flush ();
                        ThreadQueue(Thread.CurrentThread).PostQuitState = true;
-               }\r
-\r
-               [MonoTODO]\r
-               internal override void RequestAdditionalWM_NCMessages (IntPtr handle, bool hover, bool leave)\r
-               {\r
-                       X11Hwnd hwnd = (X11Hwnd)Hwnd.ObjectFromHandle(handle);\r
-\r
-                       if (hwnd != null)\r
-                               hwnd.RequestAdditionalWM_NCMessages (hover, leave);\r
+               }
+
+               [MonoTODO]
+               internal override void RequestAdditionalWM_NCMessages (IntPtr handle, bool hover, bool leave)
+               {
+                       X11Hwnd hwnd = (X11Hwnd)Hwnd.ObjectFromHandle(handle);
+
+                       if (hwnd != null)
+                               hwnd.RequestAdditionalWM_NCMessages (hover, leave);
                }
                
                internal override void RequestNCRecalc (IntPtr handle)