Changeset 29474 for lang/ruby/ruwin

Timestamp:

02/03/09 16:32:44 (4 years ago)

Author:

isaisstillalive

Message:

• PopupMenuでセパレータを作成できるようにした。
  

Location:

lang/ruby/ruwin

Files:

• lib/ruwin/const.rb (modified) (1 diff)
• lib/ruwin/popup_menu.rb (modified) (3 diffs)
• sample/sample_popup_menu.rb (modified) (1 diff)
• test/ruwin/test_popup_menu.rb (modified) (4 diffs)

lang/ruby/ruwin/lib/ruwin/const.rb

@@ -430 +430 @@
       PBM_SETBKCOLOR  = 0x2001
     end
+    
+    module Menu
+      MF_SEPARATOR = 0x0800
+    end
   end
   

lang/ruby/ruwin/lib/ruwin/popup_menu.rb

@@ -1 +1 @@
 module Ruwin
   class PopupMenu
+    include Const::Menu
+    
     TrackPopupMenu = Win32API.new "USER32.DLL", "TrackPopupMenu", %w{L L I I I I P}, "I"
     
@@ -6 +8 @@
       @menu = Ruwin::Factory.newpopup
       self.class.items.each_with_index do |item, index|
-        @menu.append item, index
+        if item
+          @menu.append item, index
+        else
+          @menu.append "", index, MF_SEPARATOR
+        end
       end
       @window = window
@@ -42 +48 @@
       end
       
+      def separator
+        @items << nil
+        @actions << nil
+      end
+      
       def inherited klass
         klass.instance_variable_set :@items, []

lang/ruby/ruwin/sample/sample_popup_menu.rb

@@ -23 +23 @@
       button.caption = "Selected Item2"
     end
+    
+    separator
+    
+    item "Item3" do
+      button.caption = "Selected Item3"
+    end
   end
   

lang/ruby/ruwin/test/ruwin/test_popup_menu.rb

@@ -3 +3 @@
 
 class TestRuwinPopupMenu < Test::Unit::TestCase
+  include Ruwin::Const::Menu
+  
   def setup
     @klass = Class.new(Ruwin::PopupMenu)
@@ -36 +38 @@
   def test_item_class_method_should_convert_caption_utf8_to_sjis
     klass = Class.new(Ruwin::PopupMenu)
-    klass.class_eval "item(\"アイテム\"){}"
+    klass.class_eval 'item("アイテム"){}'
     assert_equal NKF.nkf("-Ws", "アイテム"), klass.items[0]
   end
@@ -46 +48 @@
   end
   
+  def test_separator_class_method_should_append_nil_named_item
+    klass = Class.new(Ruwin::PopupMenu)
+    klass.class_eval 'item("text1"){ [self, :item1] }'
+    klass.class_eval 'separator'
+    klass.class_eval 'item("text2"){ [self, :item2] }'
+    assert_equal 3, klass.items.size
+    assert_equal "text1", klass.items[0]
+    assert_nil            klass.items[1]
+    assert_equal "text2", klass.items[2]
+  end
+  
+  def test_separator_class_method_should_append_nil_action
+    klass = Class.new(Ruwin::PopupMenu)
+    klass.class_eval 'item("text1"){ [self, :item1] }'
+    klass.class_eval 'separator'
+    klass.class_eval 'item("text2"){ [self, :item2] }'
+    assert_equal 3, klass.items.size
+    assert_equal [klass, :item1], klass.actions[0].call
+    assert_nil                    klass.actions[1]
+    assert_equal [klass, :item2], klass.actions[2].call
+  end
+  
   
   def test_initialize_should_call_newpopup
@@ -51 +75 @@
     assert_instance_of SWin::Menu, @instance.instance_variable_get(:@menu)
     assert_equal       2,          @instance.instance_variable_get(:@menu).count
+  end
+  
+  def test_initialize_should_create_separator
+    klass = Class.new(Ruwin::PopupMenu)
+    klass.class_eval 'item("text1"){ [self, :item1] }'
+    klass.class_eval 'separator'
+    klass.class_eval 'item("text2"){ [self, :item2] }'
+    instance = klass.new @window
+    assert_equal 3, instance.instance_variable_get(:@menu).count
+    assert_equal MF_SEPARATOR, (instance.instance_variable_get(:@menu).getState(1)&MF_SEPARATOR)
   end