dotgnu-pnet-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[dotgnu-pnet-commits] pnetlib ChangeLog System.Drawing.Xsharp/Drawing...


From: Heiko Weiss
Subject: [dotgnu-pnet-commits] pnetlib ChangeLog System.Drawing.Xsharp/Drawing...
Date: Thu, 10 Apr 2008 06:24:13 +0000

CVSROOT:        /sources/dotgnu-pnet
Module name:    pnetlib
Changes by:     Heiko Weiss <brubbel>   08/04/10 06:24:12

Modified files:
        .              : ChangeLog 
        System.Drawing.Xsharp: DrawingMdiClient.cs DrawingPopupWindow.cs 
                               DrawingTopLevelWindow.cs DrawingWindow.cs 
        Xsharp         : Drawable.cs 

Log message:
        allow to get the X Window handle
        fixed a null ref exception, when pressing a key and window is destroyed

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnetlib/ChangeLog?cvsroot=dotgnu-pnet&r1=1.2529&r2=1.2530
http://cvs.savannah.gnu.org/viewcvs/pnetlib/System.Drawing.Xsharp/DrawingMdiClient.cs?cvsroot=dotgnu-pnet&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pnetlib/System.Drawing.Xsharp/DrawingPopupWindow.cs?cvsroot=dotgnu-pnet&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pnetlib/System.Drawing.Xsharp/DrawingTopLevelWindow.cs?cvsroot=dotgnu-pnet&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/pnetlib/System.Drawing.Xsharp/DrawingWindow.cs?cvsroot=dotgnu-pnet&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/pnetlib/Xsharp/Drawable.cs?cvsroot=dotgnu-pnet&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/dotgnu-pnet/pnetlib/ChangeLog,v
retrieving revision 1.2529
retrieving revision 1.2530
diff -u -b -r1.2529 -r1.2530
--- ChangeLog   7 Jan 2008 15:27:01 -0000       1.2529
+++ ChangeLog   10 Apr 2008 06:24:11 -0000      1.2530
@@ -1,3 +1,12 @@
+2008-04-10  Heiko Weiss <address@hidden>
+       * System.Drawing.Xsharp/DrawingMdiClient.cs, 
+       System.Drawing.Xsharp/DrawingPopupWindow.cs,
+       System.Drawing.Xsharp/DrawingTopLevelWindow.cs,
+       System.Drawing.Xsharp/DrawingWindow.cs,
+       Xsharp/Drawable.cs: allow to get the X Window handle.
+       * System.Drawing.Xsharp/DrawingWindow.cs: fixed a null ref exception, 
when 
+       pressing a key and window is destroyed.
+
 2008-01-07  Heiko Weiss <address@hidden>
 
        * System.Windows.Forms/TabControl.cs: fixed clearing tab pages.

Index: System.Drawing.Xsharp/DrawingMdiClient.cs
===================================================================
RCS file: 
/sources/dotgnu-pnet/pnetlib/System.Drawing.Xsharp/DrawingMdiClient.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- System.Drawing.Xsharp/DrawingMdiClient.cs   7 Aug 2005 10:31:35 -0000       
1.8
+++ System.Drawing.Xsharp/DrawingMdiClient.cs   10 Apr 2008 06:24:12 -0000      
1.9
@@ -201,7 +201,7 @@
        // Get the HWND for this window.  IntPtr.Zero if not supported.
        IntPtr IToolkitWindow.GetHwnd()
                        {
-                               return IntPtr.Zero;
+                               return new IntPtr( (int)GetWidgetHandle() );
                        }
 
        // Invalidate this window.

Index: System.Drawing.Xsharp/DrawingPopupWindow.cs
===================================================================
RCS file: 
/sources/dotgnu-pnet/pnetlib/System.Drawing.Xsharp/DrawingPopupWindow.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- System.Drawing.Xsharp/DrawingPopupWindow.cs 7 Aug 2005 10:36:12 -0000       
1.13
+++ System.Drawing.Xsharp/DrawingPopupWindow.cs 10 Apr 2008 06:24:12 -0000      
1.14
@@ -200,7 +200,7 @@
        // Get the HWND for this window.  IntPtr.Zero if not supported.
        IntPtr IToolkitWindow.GetHwnd()
                        {
-                               return IntPtr.Zero;
+                               return new IntPtr( (int)GetWidgetHandle() );
                        }
 
        // Invalidate this window.

Index: System.Drawing.Xsharp/DrawingTopLevelWindow.cs
===================================================================
RCS file: 
/sources/dotgnu-pnet/pnetlib/System.Drawing.Xsharp/DrawingTopLevelWindow.cs,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- System.Drawing.Xsharp/DrawingTopLevelWindow.cs      13 Jan 2006 09:07:59 
-0000      1.33
+++ System.Drawing.Xsharp/DrawingTopLevelWindow.cs      10 Apr 2008 06:24:12 
-0000      1.34
@@ -213,7 +213,7 @@
        // Get the HWND for this window.  IntPtr.Zero if not supported.
        IntPtr IToolkitWindow.GetHwnd()
                        {
-                               return IntPtr.Zero;
+                               return new IntPtr( (int)GetWidgetHandle() );
                        }
 
        // Invalidate this window.

Index: System.Drawing.Xsharp/DrawingWindow.cs
===================================================================
RCS file: /sources/dotgnu-pnet/pnetlib/System.Drawing.Xsharp/DrawingWindow.cs,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- System.Drawing.Xsharp/DrawingWindow.cs      12 Jun 2006 09:19:42 -0000      
1.32
+++ System.Drawing.Xsharp/DrawingWindow.cs      10 Apr 2008 06:24:12 -0000      
1.33
@@ -210,7 +210,7 @@
        // Get the HWND for this window.  IntPtr.Zero if not supported.
        IntPtr IToolkitWindow.GetHwnd()
                        {
-                               return IntPtr.Zero;
+                               return new IntPtr( (int)GetWidgetHandle() );
                        }
 
        // Invalidate this window.
@@ -550,6 +550,7 @@
                                                        // Clean old ASCII DEL 
(0x7F)
                                                        if(ch != (char)0x7F)
                                                        {
+                                                               if( sink != 
null ) {  // window might be closed by sink.ToolkitKeyDown
                                                                
if(sink.ToolkitKeyChar(ch))
                                                                {
                                                                        
processed = true;
@@ -558,6 +559,7 @@
                                                }
                                        }
                                }
+                               }
                                return processed;
                        }
 

Index: Xsharp/Drawable.cs
===================================================================
RCS file: /sources/dotgnu-pnet/pnetlib/Xsharp/Drawable.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Xsharp/Drawable.cs  14 Mar 2006 18:43:29 -0000      1.7
+++ Xsharp/Drawable.cs  10 Apr 2008 06:24:12 -0000      1.8
@@ -90,7 +90,7 @@
 
        // Get the handle for drawable, assuming that it is
        // a widget.  Should be called with the display lock.
-       internal XWindow GetWidgetHandle()
+       public XWindow GetWidgetHandle()
                        {
                                if(handle != XDrawable.Zero)
                                {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]