[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing.Xsharp DrawingTopLevelWindow.cs,1.2,1.3 DrawingWindow.cs,1.2,1.3

[Rhys Weatherley <address@hidden>]

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

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


Process user-initiated move and resize events from the window manager;
implement "SetBoundsCore" and window invalidation.


Index: DrawingTopLevelWindow.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing.Xsharp/DrawingTopLevelWindow.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** DrawingTopLevelWindow.cs    11 Jun 2003 07:07:19 -0000      1.2
--- DrawingTopLevelWindow.cs    11 Jun 2003 10:37:27 -0000      1.3
***************
*** 201,204 ****
--- 201,224 ----
                        }
  
+       // Invalidate this window.
+       void IToolkitWindow.Invalidate()
+                       {
+                               Repaint();
+                       }
+ 
+       // Invalidate a rectangle within this window.
+       void IToolkitWindow.Invalidate(int x, int y, int width, int height)
+                       {
+                               DrawingToolkit.ValidateWindowPosition(ref x, 
ref y);
+                               DrawingToolkit.ValidateWindowSize(ref width, 
ref height);
+                               Repaint();
+                       }
+ 
+       // Force an update of all invalidated regions.
+       void IToolkitWindow.Update()
+                       {
+                               // TODO
+                       }
+ 
        // Set the event sink to use for this window.
        void IToolkitWindow.SetEventSink(IToolkitEventSink sink)
***************
*** 342,345 ****
--- 362,383 ----
                                        sink.ToolkitExpose(gr);
                                        gr.Dispose();
+                               }
+                       }
+ 
+       // Override the move event from Xsharp.
+       protected override void OnMove(int x, int y)
+                       {
+                               if(sink != null)
+                               {
+                                       sink.ToolkitExternalMove(x, y);
+                               }
+                       }
+ 
+       // Override the resize event from Xsharp.
+       protected override void OnResize(int width, int height)
+                       {
+                               if(sink != null)
+                               {
+                                       sink.ToolkitExternalResize(width, 
height);
                                }
                        }

Index: DrawingWindow.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing.Xsharp/DrawingWindow.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** DrawingWindow.cs    11 Jun 2003 07:07:19 -0000      1.2
--- DrawingWindow.cs    11 Jun 2003 10:37:27 -0000      1.3
***************
*** 197,200 ****
--- 197,220 ----
                        }
  
+       // Invalidate this window.
+       void IToolkitWindow.Invalidate()
+                       {
+                               Repaint();
+                       }
+ 
+       // Invalidate a rectangle within this window.
+       void IToolkitWindow.Invalidate(int x, int y, int width, int height)
+                       {
+                               DrawingToolkit.ValidateWindowPosition(ref x, 
ref y);
+                               DrawingToolkit.ValidateWindowSize(ref width, 
ref height);
+                               Repaint();
+                       }
+ 
+       // Force an update of all invalidated regions.
+       void IToolkitWindow.Update()
+                       {
+                               // TODO
+                       }
+ 
        // Set the event sink to use for this window.
        void IToolkitWindow.SetEventSink(IToolkitEventSink sink)