[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing.Xsharp DrawingPopupWindow.cs, 1.3, 1.4 DrawingTopLevelWindow.cs, 1.12, 1.13 DrawingWindow.cs, 1.13, 1.14

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/System.Drawing.Xsharp
In directory subversions:/tmp/cvs-serv25869/System.Drawing.Xsharp

Modified Files:
        DrawingPopupWindow.cs DrawingTopLevelWindow.cs 
        DrawingWindow.cs 
Log Message:


Add toolkit support for "Capture", which is needed for Win32, but ignored
under Xsharp since X already does implicit captures between a mouse down
and a mouse up.


Index: DrawingPopupWindow.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing.Xsharp/DrawingPopupWindow.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** DrawingPopupWindow.cs       29 Jul 2003 01:56:08 -0000      1.3
--- DrawingPopupWindow.cs       1 Aug 2003 00:33:42 -0000       1.4
***************
*** 33,36 ****
--- 33,37 ----
        private IToolkit toolkit;
        private IToolkitEventSink sink;
+       private bool hasCapture;
  
        // Constructor.
***************
*** 89,92 ****
--- 90,109 ----
                                {
                                        return Focused;
+                               }
+                       }
+ 
+       // Get or set the mouse capture on this window.  Mouse captures
+       // typically aren't required in the same place where Windows
+       // needs them.  It is also highly dangerous to allow X applications
+       // to capture the mouse without very careful thought.
+       bool IToolkitWindow.Capture
+                       {
+                               get
+                               {
+                                       return hasCapture;
+                               }
+                               set
+                               {
+                                       hasCapture = value;
                                }
                        }

Index: DrawingTopLevelWindow.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing.Xsharp/DrawingTopLevelWindow.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** DrawingTopLevelWindow.cs    29 Jul 2003 10:29:09 -0000      1.12
--- DrawingTopLevelWindow.cs    1 Aug 2003 00:33:43 -0000       1.13
***************
*** 33,36 ****
--- 33,37 ----
        private IToolkit toolkit;
        private IToolkitEventSink sink;
+       private bool hasCapture;
  
        // Constructor.
***************
*** 92,99 ****
                        }
  
        // Set the focus to this window.
        void IToolkitWindow.Focus()
                        {
!                               //TODO
                        }
  
--- 93,116 ----
                        }
  
+       // Get or set the mouse capture on this window.  Mouse captures
+       // typically aren't required in the same place where Windows
+       // needs them.  It is also highly dangerous to allow X applications
+       // to capture the mouse without very careful thought.
+       bool IToolkitWindow.Capture
+                       {
+                               get
+                               {
+                                       return hasCapture;
+                               }
+                               set
+                               {
+                                       hasCapture = value;
+                               }
+                       }
+ 
        // Set the focus to this window.
        void IToolkitWindow.Focus()
                        {
!                               RequestFocus();
                        }
  

Index: DrawingWindow.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing.Xsharp/DrawingWindow.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** DrawingWindow.cs    29 Jul 2003 10:29:09 -0000      1.13
--- DrawingWindow.cs    1 Aug 2003 00:33:43 -0000       1.14
***************
*** 34,37 ****
--- 34,38 ----
        private IToolkitEventSink sink;
        private ButtonName button;
+       private bool hasCapture;
  
        // Constructor.
***************
*** 90,93 ****
--- 91,110 ----
                                {
                                        return Focused;
+                               }
+                       }
+ 
+       // Get or set the mouse capture on this window.  Mouse captures
+       // typically aren't required in the same place where Windows
+       // needs them.  It is also highly dangerous to allow X applications
+       // to capture the mouse without very careful thought.
+       bool IToolkitWindow.Capture
+                       {
+                               get
+                               {
+                                       return hasCapture;
+                               }
+                               set
+                               {
+                                       hasCapture = value;
                                }
                        }