Changeset 450

Timestamp:

03/04/2008 11:34:29 (6 months ago)

Author:

why

Message:

• shoes/app.c: bug in keyboard handling going to the focused window on win32. spotted by Thomas Bell who did a good job.
  
• Rakefile: uh, keep REXML.
  

Location:

trunk

Files:

• Rakefile (modified) (1 diff)
• shoes/app.c (modified) (1 diff)

trunk/Rakefile

@@ -95 +95 @@
   rm_f  FileList["dist/ruby/lib/**/*.h"]
   unless ENV['STANDARD']
-    %w[cgi cgi.rb cgi-lib.rb rdoc rexml rss shell soap webrick wsdl xsd].each do |libn|
+    %w[cgi cgi.rb cgi-lib.rb rdoc rss shell soap webrick wsdl xsd].each do |libn|
       rm_rf "dist/ruby/lib/#{libn}"
     end

trunk/shoes/app.c

@@ -1698 +1698 @@
       if (msgs.message == WM_KEYDOWN || msgs.message == WM_KEYUP)
       {
-        shoes_app *appk = (shoes_app *)GetWindowLong(msgs.hwnd, GWL_USERDATA);
-        if (RARRAY_LEN(appk->slot.controls) > 0)
+        HWND focused = GetFocus();
+        shoes_app *appk = (shoes_app *)GetWindowLong(focused, GWL_USERDATA);
+        if (appk != NULL && RARRAY_LEN(appk->slot.controls) > 0)
         {
           switch (msgs.wParam)