Changeset 29107

Timestamp:

01/27/09 11:56:48 (4 years ago)

Author:

isaisstillalive

Message:

• EditField#caption?=を廃止し、EditField#string?=に変更。
  
• 非Multilineに対して複数行のテキストを入力した際の動作が、EditFieldとRichとで違なる（EditFieldは改行文字を含めて全て。Richでは1行目のみが入力される）ようなので、改行文字を消して全て入力するに統一。
  
• Multilineでも複数の改行コードをそのまま入れてしまうようなので、CRLFに変換して入力するようにした。
  
• caption=の上書きを考えたが、どうやら呼び出す際にundoキャッシュしてしまうらしい？　動作がよくわからなかったのでstring=を新設した。
  

Location:

lang/ruby/ruwin

Files:

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

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

@@ -104 +104 @@
     end
     
+    private :caption=
+    def string= string
+      self.caption = string.gsub(/\r\n|\r|\n/m, "")
+    end
+        
     class Multiline < EditField
       STYLE = Control::STYLE | ES_MULTILINE | ES_AUTOVSCROLL
+      
+      def string= string
+        self.caption = string.gsub(/\r\n|\r|\n/m, "\r\n")
+      end
     end
   end

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

@@ -97 +97 @@
       class Multiline < Rich
         STYLE = EditField::Multiline::STYLE
+        
+        def string= string
+          self.caption = string.gsub(/\r\n|\r|\n/m, "\r\n")
+        end
       end
     end

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

@@ -96 +96 @@
   
   def test_string
-    @control.caption = "caption"
+    @control.string = "caption"
     assert_equal "caption", @control.string
   end
@@ -109 +109 @@
   
   def test_concat
-    @control.caption = "caption"
+    @control.string = "caption"
     @control.selection.change 1, 4
     @control.concat "-concat"
@@ -120 +120 @@
   
   def test_selection
-    @control.caption = "caption"
+    @control.string = "caption"
     @control.selection.change 2, 5
     
@@ -132 +132 @@
   
   def test_range_selection
-    @control.caption = "caption"
+    @control.string = "caption"
     @control.selection.change 2, 5
     
@@ -145 +145 @@
   
   def test_tail
-    @control.caption = "caption"
+    @control.string = "caption"
     @control.selection.change 2, 5
     
@@ -158 +158 @@
   
   def test_head
-    @control.caption = "caption"
+    @control.string = "caption"
     @control.selection.change 2, 5
     
@@ -172 +172 @@
   
   def test_like_string_upcase
-    @control.caption = "caption"
+    @control.string = "caption"
     assert_equal "CAPTION", @control.upcase
     assert_equal "caption", @control.caption
@@ -178 +178 @@
   
   def test_like_string_upcase_d
-    @control.caption = "caption"
+    @control.string = "caption"
     assert_equal "CAPTION", @control.upcase!
     assert_equal "CAPTION", @control.caption
@@ -196 +196 @@
     assert_equal 0, (self.class::TARGET_CLASS::STYLE&(ES_MULTILINE))
     assert_equal ES_AUTOHSCROLL, (self.class::TARGET_CLASS::STYLE&(ES_AUTOHSCROLL))
+  end
+  
+  
+  def test_string_should_deny_return
+    klass = Class.new(self.class::TARGET_CLASS)
+    control = klass.new(@window)
+    control.string = "caption\r\ncaption\rcaption\ncaption"
+    assert_equal "captioncaptioncaptioncaption", control.caption
   end
 end
@@ -209 +217 @@
     assert_equal 0, (self.class::TARGET_CLASS::STYLE&(Ruwin::Const::Window::WS_VSCROLL))
   end
+  
+  
+  def test_string_should_allow_return
+    klass = Class.new(self.class::TARGET_CLASS)
+    control = klass.new(@window)
+    control.string = "caption\r\ncaption\rcaption\ncaption"
+    assert_equal "caption\r\ncaption\r\ncaption\r\ncaption", control.caption
+  end
 end
 
@@ -247 +263 @@
   
   def test_change
-    @control.caption = "caption"
+    @control.string = "caption"
     @selection.change 2, 5
     assert_equal [[EM_SETSEL, 2, 5]], @control.message_log
@@ -255 +271 @@
   
   def test_change_without_reflection
-    @control.caption = "caption"
+    @control.string = "caption"
     @selection_without_reflection.change 2, 5
     assert_equal [], @control.message_log
@@ -263 +279 @@
   
   def test_first_setter
-    @control.caption = "caption"
+    @control.string = "caption"
     @selection.change 2, 5
     @control.message_log.clear
@@ -273 +289 @@
   
   def test_last_setter
-    @control.caption = "caption"
+    @control.string = "caption"
     @selection.change 2, 5
     @control.message_log.clear
@@ -284 +300 @@
   
   def test_range
-    @control.caption = "caption"
+    @control.string = "caption"
     @selection.change 2, 5
     @control.message_log.clear
@@ -293 +309 @@
   
   def test_change_without_reflection
-    @control.caption = "caption"
+    @control.string = "caption"
     @selection_without_reflection.change 2, 5
     @control.message_log.clear
@@ -302 +318 @@
   
   def test_first_getter
-    @control.caption = "caption"
+    @control.string = "caption"
     @selection.change 2, 5
     @control.message_log.clear
@@ -311 +327 @@
   
   def test_last_getter
-    @control.caption = "caption"
+    @control.string = "caption"
     @selection.change 2, 5
     @control.message_log.clear
@@ -321 +337 @@
   
   def test_string_getter
-    @control.caption = "caption"
+    @control.string = "caption"
     @selection.change 1, 4
     assert_equal "apt", @selection.string
@@ -327 +343 @@
   
   def test_string_getter_without_reflection
-    @control.caption = "caption"
+    @control.string = "caption"
     @selection_without_reflection.change 1, 4
     assert_equal "apt", @selection_without_reflection.string
@@ -334 +350 @@
   
   def test_string_setter
-    @control.caption = "caption"
+    @control.string = "caption"
     @selection.change 3, 6
     @selection.string = "ricor"
@@ -341 +357 @@
   
   def test_string_setter_without_reflection
-    @control.caption = "caption"
+    @control.string = "caption"
     @selection_without_reflection.change 3, 6
     @selection_without_reflection.string = "ricor"
@@ -350 +366 @@
   
   def test_with
-    @control.caption = "caption"
+    @control.string = "caption"
     
     selection_with = nil
@@ -362 +378 @@
   
   def test_with_without_reflection
-    @control.caption = "caption"
+    @control.string = "caption"
     @selection_without_reflection.change 3, 6
     
@@ -380 +396 @@
   
   def test_length
-    @control.caption = "caption"
+    @control.string = "caption"
     @selection.change 1, 4
     assert_equal 3, @selection.length