glimmer-dsl-libui 0.1.5 → 0.1.6

data/lib/glimmer/libui/{square.rb → shape/square.rb}

@@ -23,13 +23,15 @@ require 'glimmer/libui/shape'
 
 module Glimmer
   module LibUI
-    class Square < Shape
-      parameters :x, :y, :length
-      parameter_defaults 0, 0, 0
-    
-      def draw(area_draw_params)
-        ::LibUI.draw_path_add_rectangle(path_proxy.libui, *@args, length)
-        super
+    class Shape
+      class Square < Shape
+        parameters :x, :y, :length
+        parameter_defaults 0, 0, 0
+      
+        def draw(area_draw_params)
+          ::LibUI.draw_path_add_rectangle(path_proxy.libui, *@args, length)
+          super
+        end
       end
     end
   end

data/lib/glimmer/libui/shape.rb

@@ -20,6 +20,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/libui/parent'
+require 'glimmer/libui/control_proxy/area_proxy'
+require 'glimmer/libui/control_proxy/path_proxy'
 
 module Glimmer
   module LibUI
@@ -27,7 +29,7 @@ module Glimmer
     class Shape
       class << self
         def exists?(keyword)
-          Glimmer::LibUI.constants.include?(constant_symbol(keyword)) and
+          Shape.constants.include?(constant_symbol(keyword)) and
             shape_class(keyword).respond_to?(:ancestors) and
             shape_class(keyword).ancestors.include?(Shape)
         end
@@ -37,7 +39,7 @@ module Glimmer
         end
         
         def shape_class(keyword)
-          Glimmer::LibUI.const_get(constant_symbol(keyword))
+          Shape.const_get(constant_symbol(keyword))
         end
         
         def parameters(*params)
@@ -56,8 +58,6 @@ module Glimmer
           end
         end
         
-        private
-        
         def constant_symbol(keyword)
           "#{keyword.camelcase(:upper)}".to_sym
         end
@@ -95,11 +95,11 @@ module Glimmer
       end
       
       def area_proxy
-        find_parent_in_ancestors { |parent| parent.nil? || parent.is_a?(AreaProxy) }
+        find_parent_in_ancestors { |parent| parent.nil? || parent.is_a?(ControlProxy::AreaProxy) }
       end
       
       def path_proxy
-        find_parent_in_ancestors { |parent| parent.nil? || parent.is_a?(PathProxy) }
+        find_parent_in_ancestors { |parent| parent.nil? || parent.is_a?(ControlProxy::PathProxy) }
       end
       
       def respond_to?(method_name, *args, &block)
@@ -141,3 +141,5 @@ module Glimmer
     end
   end
 end
+
+Dir[File.expand_path("./#{File.basename(__FILE__, '.rb')}/*.rb", __dir__)].each {|f| require f}

data/lib/glimmer/libui.rb

@@ -29,10 +29,52 @@ module Glimmer
       def boolean_to_integer(bool, allow_nil: true)
         bool.nil? ? (allow_nil ? nil : 0) : (bool ? 1 : 0)
       end
+      
+      def interpret_color(value)
+        if value.is_a?(Array) && value.last.is_a?(Hash)
+          options = value.last
+          value = value[0...-1]
+        end
+        value = value.first if value.is_a?(Array) && value.size == 1
+        value = value.to_s if value.is_a?(Symbol)
+        value = value[:color] if value.is_a?(Hash) && value[:color]
+        result = if value.is_a?(Array)
+          old_value = value
+          value = {
+            r: value[0],
+            g: value[1],
+            b: value[2],
+          }
+          value[:a] = value[3] unless value[3].nil?
+          value
+        elsif value.is_a?(Hash)
+          old_value = value
+          value = old_value.dup
+          value[:r] = value.delete(:red) if value[:red]
+          value[:g] = value.delete(:green) if value[:green]
+          value[:b] = value.delete(:blue) if value[:blue]
+          value[:a] = value.delete(:alpha) if value[:alpha]
+          value
+        elsif value.is_a?(String) && !value.start_with?('0x') && !value.downcase.match(/^((([1-9a-f]){6})|(([1-9a-f]){3}))$/)
+          color = Color::RGB.extract_colors(value).first
+          color.nil? ? {} : {
+            r: color.red,
+            g: color.green,
+            b: color.blue,
+          }
+        else
+          hex_to_rgb(value)
+        end
+        result.merge!(options) if options
+        result
+      end
     
       def hex_to_rgb(value)
         if value.is_a?(String)
-          value = "0x#{value}" if !value.start_with?('0x')
+          if !value.start_with?('0x')
+            value = value.chars.map {|char| [char, char]}.flatten.join if value.length == 3
+            value = "0x#{value}"
+          end
           value = value.to_i(16)
         end
         if value.is_a?(Integer)

data/lib/glimmer-dsl-libui.rb

@@ -26,6 +26,7 @@ require 'glimmer'
 # require 'logging'
 # require 'puts_debuggerer' if ENV['pd'].to_s.downcase == 'true'
 # require 'super_module'
+require 'color'
 require 'os'
 require 'array_include_methods'
 require 'libui'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-libui
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2021-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -44,6 +44,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: color
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: libui
   requirement: !ruby/object:Gem::Requirement
@@ -240,61 +254,64 @@ files:
 - lib/glimmer/dsl/libui/tab_item_expression.rb
 - lib/glimmer/fiddle_consumer.rb
 - lib/glimmer/libui.rb
-- lib/glimmer/libui/about_menu_item_proxy.rb
-- lib/glimmer/libui/arc.rb
-- lib/glimmer/libui/area_proxy.rb
-- lib/glimmer/libui/bezier.rb
-- lib/glimmer/libui/box.rb
-- lib/glimmer/libui/button_column_proxy.rb
-- lib/glimmer/libui/button_proxy.rb
-- lib/glimmer/libui/check_menu_item_proxy.rb
-- lib/glimmer/libui/checkbox_column_proxy.rb
-- lib/glimmer/libui/checkbox_proxy.rb
-- lib/glimmer/libui/checkbox_text_column_proxy.rb
-- lib/glimmer/libui/color_button_proxy.rb
-- lib/glimmer/libui/column.rb
-- lib/glimmer/libui/combobox_proxy.rb
 - lib/glimmer/libui/control_proxy.rb
-- lib/glimmer/libui/date_picker_proxy.rb
-- lib/glimmer/libui/date_time_picker_proxy.rb
-- lib/glimmer/libui/dual_column.rb
-- lib/glimmer/libui/editable_column.rb
-- lib/glimmer/libui/editable_combobox_proxy.rb
-- lib/glimmer/libui/enableable_column.rb
-- lib/glimmer/libui/figure.rb
-- lib/glimmer/libui/font_button_proxy.rb
-- lib/glimmer/libui/form_proxy.rb
-- lib/glimmer/libui/grid_proxy.rb
-- lib/glimmer/libui/group_proxy.rb
-- lib/glimmer/libui/horizontal_box_proxy.rb
-- lib/glimmer/libui/image_column_proxy.rb
-- lib/glimmer/libui/image_part_proxy.rb
-- lib/glimmer/libui/image_proxy.rb
-- lib/glimmer/libui/image_text_column_proxy.rb
-- lib/glimmer/libui/label_proxy.rb
-- lib/glimmer/libui/line.rb
-- lib/glimmer/libui/matrix_proxy.rb
-- lib/glimmer/libui/menu_item_proxy.rb
-- lib/glimmer/libui/menu_proxy.rb
-- lib/glimmer/libui/multiline_entry_proxy.rb
-- lib/glimmer/libui/non_wrapping_multiline_entry_proxy.rb
+- lib/glimmer/libui/control_proxy/area_proxy.rb
+- lib/glimmer/libui/control_proxy/box.rb
+- lib/glimmer/libui/control_proxy/box/horizontal_box_proxy.rb
+- lib/glimmer/libui/control_proxy/box/vertical_box_proxy.rb
+- lib/glimmer/libui/control_proxy/button_proxy.rb
+- lib/glimmer/libui/control_proxy/checkbox_proxy.rb
+- lib/glimmer/libui/control_proxy/color_button_proxy.rb
+- lib/glimmer/libui/control_proxy/column.rb
+- lib/glimmer/libui/control_proxy/column/button_column_proxy.rb
+- lib/glimmer/libui/control_proxy/column/checkbox_column_proxy.rb
+- lib/glimmer/libui/control_proxy/column/checkbox_text_column_proxy.rb
+- lib/glimmer/libui/control_proxy/column/image_column_proxy.rb
+- lib/glimmer/libui/control_proxy/column/image_text_column_proxy.rb
+- lib/glimmer/libui/control_proxy/column/progress_bar_column_proxy.rb
+- lib/glimmer/libui/control_proxy/column/text_column_proxy.rb
+- lib/glimmer/libui/control_proxy/combobox_proxy.rb
+- lib/glimmer/libui/control_proxy/date_time_picker_proxy.rb
+- lib/glimmer/libui/control_proxy/date_time_picker_proxy/date_picker_proxy.rb
+- lib/glimmer/libui/control_proxy/date_time_picker_proxy/time_picker_proxy.rb
+- lib/glimmer/libui/control_proxy/dual_column.rb
+- lib/glimmer/libui/control_proxy/editable_column.rb
+- lib/glimmer/libui/control_proxy/editable_combobox_proxy.rb
+- lib/glimmer/libui/control_proxy/enableable_column.rb
+- lib/glimmer/libui/control_proxy/font_button_proxy.rb
+- lib/glimmer/libui/control_proxy/form_proxy.rb
+- lib/glimmer/libui/control_proxy/grid_proxy.rb
+- lib/glimmer/libui/control_proxy/group_proxy.rb
+- lib/glimmer/libui/control_proxy/image_part_proxy.rb
+- lib/glimmer/libui/control_proxy/image_proxy.rb
+- lib/glimmer/libui/control_proxy/label_proxy.rb
+- lib/glimmer/libui/control_proxy/matrix_proxy.rb
+- lib/glimmer/libui/control_proxy/menu_item_proxy.rb
+- lib/glimmer/libui/control_proxy/menu_item_proxy/about_menu_item_proxy.rb
+- lib/glimmer/libui/control_proxy/menu_item_proxy/check_menu_item_proxy.rb
+- lib/glimmer/libui/control_proxy/menu_item_proxy/preferences_menu_item_proxy.rb
+- lib/glimmer/libui/control_proxy/menu_item_proxy/quit_menu_item_proxy.rb
+- lib/glimmer/libui/control_proxy/menu_item_proxy/separator_menu_item_proxy.rb
+- lib/glimmer/libui/control_proxy/menu_proxy.rb
+- lib/glimmer/libui/control_proxy/message_box.rb
+- lib/glimmer/libui/control_proxy/message_box/msg_box_error_proxy.rb
+- lib/glimmer/libui/control_proxy/message_box/msg_box_proxy.rb
+- lib/glimmer/libui/control_proxy/multiline_entry_proxy.rb
+- lib/glimmer/libui/control_proxy/multiline_entry_proxy/non_wrapping_multiline_entry_proxy.rb
+- lib/glimmer/libui/control_proxy/path_proxy.rb
+- lib/glimmer/libui/control_proxy/radio_buttons_proxy.rb
+- lib/glimmer/libui/control_proxy/tab_item_proxy.rb
+- lib/glimmer/libui/control_proxy/table_proxy.rb
+- lib/glimmer/libui/control_proxy/transformable.rb
+- lib/glimmer/libui/control_proxy/window_proxy.rb
 - lib/glimmer/libui/parent.rb
-- lib/glimmer/libui/path_proxy.rb
-- lib/glimmer/libui/preferences_menu_item_proxy.rb
-- lib/glimmer/libui/progress_bar_column_proxy.rb
-- lib/glimmer/libui/quit_menu_item_proxy.rb
-- lib/glimmer/libui/radio_buttons_proxy.rb
-- lib/glimmer/libui/rectangle.rb
-- lib/glimmer/libui/separator_menu_item_proxy.rb
 - lib/glimmer/libui/shape.rb
-- lib/glimmer/libui/square.rb
-- lib/glimmer/libui/tab_item_proxy.rb
-- lib/glimmer/libui/table_proxy.rb
-- lib/glimmer/libui/text_column_proxy.rb
-- lib/glimmer/libui/time_picker_proxy.rb
-- lib/glimmer/libui/transformable.rb
-- lib/glimmer/libui/vertical_box_proxy.rb
-- lib/glimmer/libui/window_proxy.rb
+- lib/glimmer/libui/shape/arc.rb
+- lib/glimmer/libui/shape/bezier.rb
+- lib/glimmer/libui/shape/figure.rb
+- lib/glimmer/libui/shape/line.rb
+- lib/glimmer/libui/shape/rectangle.rb
+- lib/glimmer/libui/shape/square.rb
 homepage: http://github.com/AndyObtiva/glimmer-dsl-libui
 licenses:
 - MIT
@@ -315,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.28
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for LibUI

data/lib/glimmer/libui/about_menu_item_proxy.rb

@@ -1,37 +0,0 @@
-# Copyright (c) 2021 Andy Maleh
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require 'glimmer/libui/menu_item_proxy'
-
-module Glimmer
-  module LibUI
-    # Proxy for LibUI about menu item object
-    #
-    # Follows the Proxy Design Pattern
-    class AboutMenuItemProxy < MenuItemProxy
-      private
-      
-      def build_control
-        @libui = @parent_proxy.append_about_item(*@args)
-      end
-    end
-  end
-end

data/lib/glimmer/libui/area_proxy.rb

@@ -1,115 +0,0 @@
-# Copyright (c) 2021 Andy Maleh
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require 'glimmer/libui/control_proxy'
-require 'glimmer/fiddle_consumer'
-require 'glimmer/libui/parent'
-require 'glimmer/libui/transformable'
-
-module Glimmer
-  module LibUI
-    # Proxy for LibUI area objects
-    #
-    # Follows the Proxy Design Pattern
-    class AreaProxy < ControlProxy
-      class << self
-        # this attribute is only populated during on_draw call
-        attr_accessor :current_area_draw_params
-      end
-      
-      include Glimmer::FiddleConsumer
-      include Parent
-      prepend Transformable
-      
-      attr_reader :area_handler
-      
-      def post_add_content
-        super
-        install_listeners
-      end
-      
-      def on_draw(&block)
-        @on_draw_procs ||= []
-        if block.nil?
-          @on_draw_procs
-        else
-          @on_draw_procs << block
-          block
-        end
-      end
-      
-      def can_handle_listener?(listener_name)
-        listener_name == 'on_draw' || super
-      end
-      
-      def handle_listener(listener_name, &listener)
-        case listener_name
-        when 'on_draw'
-          on_draw(&listener)
-        else
-          super
-        end
-      end
-      
-      def draw(area_draw_params)
-        children.dup.each {|child| child.draw(area_draw_params)}
-        on_draw.each {|listener| listener.call(area_draw_params)}
-      end
-      
-      def redraw
-        queue_redraw_all
-      end
-      
-      private
-      
-      def build_control
-        @area_handler = ::LibUI::FFI::AreaHandler.malloc
-        @libui    = ::LibUI.new_area(@area_handler)
-      end
-      
-      def install_listeners
-        @area_handler.Draw         = fiddle_closure_block_caller(0, [1, 1, 1]) do |_, _, area_draw_params|
-          area_draw_params = ::LibUI::FFI::AreaDrawParams.new(area_draw_params)
-          area_draw_params = area_draw_params_hash(area_draw_params)
-          AreaProxy.current_area_draw_params = area_draw_params
-          draw(area_draw_params)
-          AreaProxy.current_area_draw_params = nil
-        end
-        @area_handler.MouseEvent   = fiddle_closure_block_caller(0, [0]) {}
-        @area_handler.MouseCrossed = fiddle_closure_block_caller(0, [0]) {}
-        @area_handler.DragBroken   = fiddle_closure_block_caller(0, [0]) {}
-        @area_handler.KeyEvent     = fiddle_closure_block_caller(0, [0]) {}
-      end
-      
-      def area_draw_params_hash(area_draw_params)
-        {
-          context: area_draw_params.Context,
-          area_width: area_draw_params.AreaWidth,
-          area_height: area_draw_params.AreaHeight,
-          clip_x: area_draw_params.ClipX,
-          clip_y: area_draw_params.ClipY,
-          clip_width: area_draw_params.ClipWidth,
-          clip_height: area_draw_params.ClipHeight,
-        }
-      end
-    end
-  end
-end

data/lib/glimmer/libui/check_menu_item_proxy.rb

@@ -1,37 +0,0 @@
-# Copyright (c) 2021 Andy Maleh
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require 'glimmer/libui/menu_item_proxy'
-
-module Glimmer
-  module LibUI
-    # Proxy for LibUI check menu item object
-    #
-    # Follows the Proxy Design Pattern
-    class CheckMenuItemProxy < MenuItemProxy
-      private
-      
-      def build_control
-        @libui = @parent_proxy.append_check_item(*@args)
-      end
-    end
-  end
-end

data/lib/glimmer/libui/checkbox_text_column_proxy.rb

@@ -1,76 +0,0 @@
-# Copyright (c) 2021 Andy Maleh
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require 'glimmer/libui/control_proxy'
-require 'glimmer/libui/column'
-require 'glimmer/libui/dual_column'
-require 'glimmer/libui/editable_column'
-
-module Glimmer
-  module LibUI
-    # Proxy for LibUI checkbox text column objects
-    #
-    # Follows the Proxy Design Pattern
-    class CheckboxTextColumnProxy < ControlProxy
-      include Column
-      include DualColumn
-      include EditableColumn
-      
-      def editable_checkbox(value = nil)
-        if value.nil?
-          @editable_checkbox = false if @editable_checkbox.nil?
-          @editable_checkbox
-        else
-          @editable_checkbox = !!value
-        end
-      end
-      alias editable_checkbox= editable_checkbox
-      alias set_editable_checkbox editable_checkbox
-      alias editable_checkbox? editable_checkbox
-
-      def editable_text(value = nil)
-        if value.nil?
-          @editable_text = false if @editable_text.nil?
-          @editable_text
-        else
-          @editable_text = !!value
-        end
-      end
-      alias editable_text= editable_text
-      alias set_editable_text editable_text
-      alias editable_text? editable_text
-
-      private
-      
-      def build_control
-        @parent_proxy.append_checkbox_text_column(name, column_index, editable_checkbox_value, second_column_index, editable_text_value)
-      end
-      
-      def editable_checkbox_value
-        (@parent_proxy.editable? || editable? || editable_checkbox?) ? -2 : -1
-      end
-      
-      def editable_text_value
-        (@parent_proxy.editable? || editable? || editable_text?) ? -2 : -1
-      end
-    end
-  end
-end