Changeset 29041

Timestamp:

01/26/09 12:06:26 (4 years ago)

Author:

isaisstillalive

Message:

• r29040 コントロールしか変更してなかった。
  

Location:

lang/ruby/ruwin

Files:

• lib/ruwin/window.rb (modified) (1 diff)
• test/ruwin/test_window.rb (modified) (2 diffs)

lang/ruby/ruwin/lib/ruwin/window.rb

@@ -80 +80 @@
       name, control = @controls[hwndControl]
       return unless control.respond_to? :wm_command
-      event, *args = control.wm_command msg
+      event, *args = control.wm_command msg, wID, wNotifyCode, hwndControl
       return unless event
       

lang/ruby/ruwin/test/ruwin/test_window.rb

@@ -185 +185 @@
       add_control Ruwin::Control, "button" do
         attr_reader :wm_command_msg
-        def wm_command msg
-          @wm_command_msg = msg
+        def wm_command *args
+          @wm_command_msg = args
           return :updated, 0, 1, 2
         end
@@ -198 +198 @@
     instance = klass.new
     
-    msg = DummyMSG.new nil, WM_COMMAND, 1, instance.button.hWnd
+    msg = DummyMSG.new nil, WM_COMMAND, 1|2<<16, instance.button.hWnd
     instance.wm_command msg
-    assert_equal msg, instance.button.wm_command_msg
+    assert_equal [msg, 1, 2, instance.button.hWnd], instance.button.wm_command_msg
     assert_equal [0, 1, 2], instance.button_updated_called
   end