Author: jackson
Date: 2005-04-27 16:33:50 -0400 (Wed, 27 Apr 2005)
New Revision: 43685

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/X11Keyboard.cs
Log:
        * X11Keyboard.cs: Initialize a default keyboard and give a warning
        if a "correct" keyboard is not found. This will make us not crash,
        but might give some users bad keyboard layouts...seems to be the
        same thing rewind does.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2005-04-27 20:24:36 UTC (rev 43684)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2005-04-27 20:33:50 UTC (rev 43685)
@@ -1,5 +1,12 @@
 2005-04-27  Jackson Harper  <[EMAIL PROTECTED]>
 
+       * X11Keyboard.cs: Initialize a default keyboard and give a warning
+       if a "correct" keyboard is not found. This will make us not crash,
+       but might give some users bad keyboard layouts...seems to be the
+       same thing rewind does.
+
+2005-04-27  Jackson Harper  <[EMAIL PROTECTED]>
+
        * BindingManagerBase.cs: Attach the current/position changed
        handlers to their respective events.
 

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/X11Keyboard.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/X11Keyboard.cs   
2005-04-27 20:24:36 UTC (rev 43684)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/X11Keyboard.cs   
2005-04-27 20:33:50 UTC (rev 43685)
@@ -44,7 +44,7 @@
                private int [] keyc2scan = new int [256];
                private byte [] key_state_table = new byte [256];
                private bool num_state, cap_state;
-               private KeyboardLayout layout;
+               private KeyboardLayout layout = KeyboardLayouts.Layouts [0];
 
                // TODO
                private int NumLockMask;
@@ -587,11 +587,11 @@
                        }
 
                        if (layout != null)  {
+                                this.layout = layout;
                                Console.WriteLine (Locale.GetText("Keyboard") + 
": " + layout.Comment);
                        } else {
-                               Console.WriteLine (Locale.GetText("Keyboard 
layout not recognized"));
+                               Console.WriteLine (Locale.GetText("Keyboard 
layout not recognized, using default layout: " + layout.Comment));
                        }
-                       this.layout = layout;
                }
 
                // TODO

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to