[macruby-changes] [2369] MacRuby/trunk/lib/hotcocoa/mappings

[source_changes at macosforge.org]

Revision: 2369
          http://trac.macosforge.org/projects/ruby/changeset/2369
Author:   rich at infoether.com
Date:     2009-08-24 22:23:02 -0700 (Mon, 24 Aug 2009)
Log Message:
-----------
fix class scoping issues

Modified Paths:
--------------
    MacRuby/trunk/lib/hotcocoa/mappings/combo_box.rb
    MacRuby/trunk/lib/hotcocoa/mappings/segmented_control.rb
    MacRuby/trunk/lib/hotcocoa/mappings/table_view.rb

Modified: MacRuby/trunk/lib/hotcocoa/mappings/combo_box.rb
===================================================================
--- MacRuby/trunk/lib/hotcocoa/mappings/combo_box.rb	2009-08-25 05:17:45 UTC (rev 2368)
+++ MacRuby/trunk/lib/hotcocoa/mappings/combo_box.rb	2009-08-25 05:23:02 UTC (rev 2369)
@@ -10,7 +10,7 @@
 
     def data=(data_source)
       setUsesDataSource(true)
-      data_source = ComboBoxDataSource.new(data_source) if data_source.kind_of?(Array)
+      data_source = HotCocoa::ComboBoxDataSource.new(data_source) if data_source.kind_of?(Array)
       setDataSource(data_source)
     end
     

Modified: MacRuby/trunk/lib/hotcocoa/mappings/segmented_control.rb
===================================================================
--- MacRuby/trunk/lib/hotcocoa/mappings/segmented_control.rb	2009-08-25 05:17:45 UTC (rev 2368)
+++ MacRuby/trunk/lib/hotcocoa/mappings/segmented_control.rb	2009-08-25 05:23:02 UTC (rev 2369)
@@ -1,3 +1,61 @@
+module HotCocoa
+  class SegmentedControlSegment
+    attr_reader :number, :control
+    def initialize(control, number)
+      @number = number
+      @control = control
+    end
+    
+    def width
+      control.widthForSegment(number)
+    end
+    
+    def width=(width)
+      control.setWidth(width, forSegment:number)
+    end
+    
+    def label
+      control.labelForSegment(number)
+    end
+    
+    def label=(label)
+      control.setLabel(label, forSegment:number)
+    end
+    
+    def image
+      control.imageForSegment(number)
+    end
+    
+    def image=(image)
+      control.setImage(image, forSegment:number)
+    end
+    
+    def menu
+      control.menuForSegment(number)
+    end
+    
+    def menu=(menu)
+      control.setMenu(menu, forSegment:number)
+    end
+    
+    def selected?
+      control.isSelectedForSegment(number)
+    end
+    
+    def selected=(value)
+      control.setSelected(value, forSegment:number)
+    end
+    
+    def enabled?
+      control.isEnabledForSegment(number)
+    end
+    
+    def enabled=(value)
+      control.setEnabled(value, forSegment:number)
+    end
+  end
+end
+
 HotCocoa::Mappings.map :segmented_control => :NSSegmentedControl do
   
   defaults :layout => {}, :frame => [0,0,0,0]
@@ -8,62 +66,6 @@
   
   custom_methods do
     
-    class Segment
-      attr_reader :number, :control
-      def initialize(control, number)
-        @number = number
-        @control = control
-      end
-      
-      def width
-        control.widthForSegment(number)
-      end
-      
-      def width=(width)
-        control.setWidth(width, forSegment:number)
-      end
-      
-      def label
-        control.labelForSegment(number)
-      end
-      
-      def label=(label)
-        control.setLabel(label, forSegment:number)
-      end
-      
-      def image
-        control.imageForSegment(number)
-      end
-      
-      def image=(image)
-        control.setImage(image, forSegment:number)
-      end
-      
-      def menu
-        control.menuForSegment(number)
-      end
-      
-      def menu=(menu)
-        control.setMenu(menu, forSegment:number)
-      end
-      
-      def selected?
-        control.isSelectedForSegment(number)
-      end
-      
-      def selected=(value)
-        control.setSelected(value, forSegment:number)
-      end
-      
-      def enabled?
-        control.isEnabledForSegment(number)
-      end
-      
-      def enabled=(value)
-        control.setEnabled(value, forSegment:number)
-      end
-    end
-    
     def segments=(segments)
       segments.each do |segment|
         self << segment
@@ -72,7 +74,7 @@
 
     def <<(data)
       setSegmentCount(segmentCount+1)
-      segment = Segment.new(self, segmentCount-1)
+      segment = HotCocoa::SegmentedControlSegment.new(self, segmentCount-1)
       data.each do |key, value|
         segment.send("#{key}=", value)
       end
@@ -87,7 +89,7 @@
     end
     
     def selected_segment
-      Segment.new(self, selectedSegment)
+      HotCocoa::SegmentedControlSegment.new(self, selectedSegment)
     end
 
   end

Modified: MacRuby/trunk/lib/hotcocoa/mappings/table_view.rb
===================================================================
--- MacRuby/trunk/lib/hotcocoa/mappings/table_view.rb	2009-08-25 05:17:45 UTC (rev 2368)
+++ MacRuby/trunk/lib/hotcocoa/mappings/table_view.rb	2009-08-25 05:23:02 UTC (rev 2369)
@@ -30,7 +30,7 @@
   custom_methods do
     
     def data=(data_source)
-      data_source = TableDataSource.new(data_source) if data_source.kind_of?(Array)
+      data_source = HotCocoa::TableDataSource.new(data_source) if data_source.kind_of?(Array)
       setDataSource(data_source)
     end
     
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090824/81d741d5/attachment-0001.html>