Changeset 29128

Timestamp:

01/27/09 21:39:39 (4 years ago)

Author:

isaisstillalive

Message:

• string,string=の動作を、EditFieldとRichで統一した。
  

Location:

lang/ruby/ruwin

Files:

• lib/ruwin/edit_field.rb (modified) (5 diffs)
• lib/ruwin/edit_field/rich.rb (modified) (1 diff)
• test/ruwin/edit_field/test_rich.rb (modified) (1 diff)
• test/ruwin/testm_edit_field.rb (modified) (7 diffs)

lang/ruby/ruwin/lib/ruwin/edit_field.rb

@@ -6 +6 @@
     module Base
       include Const::EditField
+      STRING_CONVERTER = Proc.new{|string| string }
       
       attr_reader :selection
@@ -15 +16 @@
         self.writable = @proparty[:writable]
       end
+      
+      
+      def string
+        self.class::STRING_CONVERTER.call(caption.kconv(Kconv::UTF8, Kconv::SJIS)) || ""
+      end
+      alias to_s string
+      
+      def string= string
+        self.caption = self.class::STRING_CONVERTER.call(string).kconv(Kconv::SJIS, Kconv::UTF8)
+      end
+      
+      def string_converter string
+        string
+      end
+      private :string_converter
+      
+      def set_selection first, last
+        sendMessage EM_SETSEL, first, last
+      end
+      
+      def get_selection
+        ranges = sendMessage EM_GETSEL, 0, 0
+        return LOWORD(ranges), HIWORD(ranges)
+      end
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       
       
@@ -28 +65 @@
       def head
         self[0, 0]
-      end
-      
-      def string
-        caption.kconv(Kconv::UTF8, Kconv::SJIS).gsub(/\r\n|\r|\n/m, self.class::RETURN_CODE)
-      end
-      alias to_s string
-      
-      def string= string
-        self.caption = string.gsub(/\r\n|\r|\n/m, self.class::RETURN_CODE).kconv(Kconv::SJIS, Kconv::UTF8)
       end
       
@@ -100 +128 @@
     STYLE = Control::STYLE | ES_AUTOHSCROLL
     EXSTYLE = WS_EX_CLIENTEDGE
-    RETURN_CODE = ""
+    STRING_CONVERTER = Proc.new{|string| string.split(/\r\n|\r|\n/, 2)[0] }
     
     property_accessor :writable => true
+    
     private :caption, :caption=
+    
     
     def wm_lbuttondown
       p :wm_lbuttondown
     end
+    
     
     def self.read_only
@@ -115 +146 @@
     class Multiline < EditField
       STYLE = Control::STYLE | ES_MULTILINE | ES_AUTOVSCROLL
-      RETURN_CODE = "\r\n"
+      STRING_CONVERTER = Proc.new{|string| string.gsub(/\r\n|\r|\n/u, "\r\n") }
     end
   end

lang/ruby/ruwin/lib/ruwin/edit_field/rich.rb

@@ -25 +25 @@
         CLASS_NAME = "RICHEDIT"
       end
+      STRING_CONVERTER = Proc.new{|string| string }
       
       property_accessor :background_color => nil, :color => nil

lang/ruby/ruwin/test/ruwin/edit_field/test_rich.rb

@@ -128 +128 @@
     assert_equal "RICHEDIT20A", @control.classname
   end
-  
-  # 改行をそもそも含めることができない。ここのテスト手法は要検討
-  undef test_string_getter_should_deny_return
 end
 

lang/ruby/ruwin/test/ruwin/testm_edit_field.rb

@@ -13 +13 @@
   
   
+  def test_string_setter_should_encode_utf8_to_sjis
+    @control.string = "あいう"
+    assert_equal "あいう".tosjis, @control.__send__(:caption)
+  end
+  
+  def test_string_getter_should_encode_sjis_to_utf8
+    @control.__send__ :caption=, "あいう".tosjis
+    assert_equal "あいう", @control.string
+  end
+  
+  def test_string_setter
+    @control.string = "caption"
+    assert_equal "caption", @control.__send__(:caption)
+  end
+  
+  def test_string_getter_empty
+    @control.__send__ :caption=, ""
+    assert_equal "", @control.string
+  end
+  
+  def test_string_getter
+    @control.__send__ :caption=, "caption"
+    assert_equal "caption", @control.string
+  end
+  
+  
+  def test_set_selection
+    @control.string = "caption"
+    @control.set_selection 1, 4
+    assert_equal 1|4<<16, @control.sendMessage(EM_GETSEL, 0, 0)
+  end
+  
+  def test_get_selection
+    @control.string = "caption"
+    @control.sendMessage(EM_SETSEL, 1, 4)
+    assert_equal [1, 4], @control.get_selection
+  end
+  
+  
   def test_undo_q_unbuffered
     assert_equal false, @control.undo?
@@ -18 +57 @@
   
   def test_undo_q_buffered
-    @control.selection.string = "test"
+    @control.sendMessage EM_REPLACESEL, 1, "test"
     assert_equal true, @control.undo?
   end
@@ -29 +68 @@
   
   def test_undo_buffered
-    @control.selection.string = "test"
+    @control.sendMessage EM_REPLACESEL, 1, "test"
     assert_equal true, @control.undo
     assert_equal "", @control.string
@@ -94 +133 @@
   end
   
-  
-  def test_string
-    @control.string = "caption"
-    assert_equal "caption", @control.string
-  end
   
   def test_clear
@@ -188 +222 @@
     assert_equal :updated, @control.wm_command(msg, nil, EN_UPDATE, nil)
   end
-  
-  def test_string_setter_should_encode_utf8_to_sjis
-    klass = Class.new(self.class::TARGET_CLASS)
-    control = klass.new(@window)
-    control.string = "あいう"
-    assert_equal "あいう".tosjis, control.__send__(:caption)
-  end
-  
-  def test_string_getter_should_encode_sjis_to_utf8
-    klass = Class.new(self.class::TARGET_CLASS)
-    control = klass.new(@window)
-    control.__send__ :caption=, "あいう".tosjis
-    assert_equal "あいう", control.string
-  end
 end
+
 
 module TestModuleEditFieldSingle
@@ -217 +238 @@
     control = klass.new(@window)
     control.string = "caption\r\ncaption\rcaption\ncaption"
-    assert_equal "captioncaptioncaptioncaption", control.__send__(:caption)
+    assert_equal "caption", control.__send__(:caption)
   end
   
@@ -224 +245 @@
     control = klass.new(@window)
     control.__send__ :caption=, "caption\r\ncaption\rcaption\ncaption"
-    assert_equal "captioncaptioncaptioncaption", control.string
+    assert_equal "caption", control.string
   end
 end