wx_sugar 0.1.20 → 0.1.21

data/lib/wx_sugar/layout.rb

@@ -51,7 +51,9 @@ require 'wx_sugar/class_definitions'
 module WxSugar
 module Arranger
   def self.included(klass)
-    unless klass.instance_methods.include?('add')
+    old_meths = klass.instance_methods
+    # Needs to be correct for both ruby 1.8 and ruby 1.9
+    unless old_meths.include?('add') or old_meths.include?(:add)
       # don't over-write methods in sizer
       klass.module_eval { alias_method :add, :nest }
     end
@@ -135,6 +137,7 @@ module Arranger
     proportion = layout_hints[:proportion] || 0
     siz = self.current_sizer
     padding = layout_hints[:padding] || @padding
+
     siz.add(child, proportion, layout, padding || 0)
     siz.layout()
     

data/lib/wx_sugar/version.rb

@@ -1,3 +1,3 @@
 module WxSugar
-  VERSION = '0.1.20'
+  VERSION = '0.1.21'
 end

data/lib/wx_sugar/xrc/xrc2ruby.rb

@@ -62,8 +62,8 @@ module XRC2Ruby
         when 'sizeritem'
           stack.push( SizerItem.new(last_sizer) )
 
-        # Some "special" object not corresponding to 
-        when 'panewindow', 'tool', 'separator'
+        # Some "special" object not corresponding to a standard class
+        when 'panewindow', 'tool', 'separator', 'button'
           special = ObjectTypes.const_get(attrs['class'].upcase)
           stack.push( special.new(last_parent, attrs['name']) )
         # An ordinary window

data/lib/wx_sugar/xrc/xrc2ruby_types/sizers.rb

@@ -36,4 +36,37 @@ module XRC2Ruby::ObjectTypes
       "#{var_name} = Wx::BoxSizer.new(#{orient.gsub(/^wx/, "Wx::")})\n"
     end
   end
+
+  class StaticBoxSizer < Sizer
+    attr_accessor :orient, :label
+    def output
+      "#{var_name} = Wx::StaticBoxSizer.new(#{orient.gsub(/^wx/, "Wx::")}," +
+        " #{parent.var_name}, '#{label}')"
+    end
+  end
+
+  class FlexGridSizer < Sizer
+    attr_accessor :cols, :rows, :vgap, :hgap
+    def output
+      "#{var_name} = Wx::StaticBoxSizer.new(#{orient.gsub(/^wx/, "Wx::")}," +
+        " Wx::ID_ANY, '#{label}')"
+    end
+  end
+
+  class StdDialogButtonSizer < Sizer
+    attr_accessor :cols, :rows, :vgap, :hgap
+    def output
+      "#{var_name} = Wx::StaticBoxSizer.new(#{orient.gsub(/^wx/, "Wx::")}," +
+        " Wx::ID_ANY, '#{label}')"
+    end
+  end
+
+  # Not a real wxRuby class - this is a button within a
+  # StdDialogButtonSizer (do not confuse with Wx::Button)
+  class BUTTON
+    attr_accessor :flag, :border, 
+    def initialize(b_sizer, an_id)
+      p an_id
+    end
+  end
 end

data/lib/wx_sugar/xrc/xrc2ruby_types/window.rb

@@ -44,7 +44,7 @@ module XRC2Ruby::ObjectTypes
     init_arg(:style) { | val | val.gsub(/wx/, "Wx::") }
 
     # Tooltip and help text, applicable to all windows
-    attr_accessor :tooltip, :help, :hidden, :enabled, :fg, :bg
+    attr_accessor :tooltip, :help, :hidden, :enabled, :fg, :bg, :exstyle
     
     def output
       # The base constructor
@@ -84,6 +84,11 @@ module XRC2Ruby::ObjectTypes
         base << "Wx::Colour.new(#{colour.join(', ')})\n"
       end
 
+      # If extra style set
+      if self.exstyle
+        base << "#{var_name}.extra_style = #{exstyle.gsub(/^wx/, "Wx::")}"
+      end
+      
       # If explicitly disabled or enabled
       if self.enabled 
         if self.enabled.to_i.zero?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wx_sugar
 version: !ruby/object:Gem::Version 
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors: 
 - Alex Fenton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-15 00:00:00 +01:00
+date: 2008-11-14 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: weft-qda
-rubygems_version: 1.0.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Syntax extensions for WxRuby.