wx_sugar 0.1.0 → 0.1.1

data/lib/wx_sugar/accessors.rb

@@ -39,6 +39,28 @@ module NiceRubyMethodNames
   end
 end
 
+module MethMissingNiceRubyNames
+  def method_missing(sym, *args)
+    case sym.to_s
+    when /^(.*)\=$/
+      meth = "set_#{$1}"
+    when /^(.*)\?$/
+      meth = "is_#{$1}"
+    else
+      meth = "get_#{sym}"
+    end
+    if respond_to?(meth)
+      send(meth, *args)
+    else
+      e = NoMethodError.new("undefined method '#{sym}' for #{self.inspect}")
+      e.set_backtrace(caller)
+      Kernel.raise e
+    end
+  end
+end
+
+
 WxSugar::ALL_CLASSES.each do | klass |
-  klass.class_eval { include NiceRubyMethodNames }
+  # klass.class_eval { include NiceRubyMethodNames }
+  klass.class_eval { include MethMissingNiceRubyNames }
 end

data/lib/wx_sugar/all.rb

@@ -50,7 +50,7 @@
 # [menu.rb] 
 #  Create and update menus without a mess of system ids
 
-%w[ accessors delayed_constructors event_connector
-    itemdata keyword_constructors layout menu ].each do | ext_feature |
+%w[ accessors delayed_constructors event_connector itemdata 
+    keyword_constructors layout menu wx_classes ].each do | ext_feature |
   require 'wx_sugar/' + ext_feature    
 end 

data/lib/wx_sugar/event_connector.rb

@@ -89,7 +89,8 @@ module EventConnector
   #    end
   #  end
   #
-  def listen(evt, source = nil, handler = nil, &block)
+  def listen(evt, source = self, handler = nil, &block)
+
     # get the WxWidget evt_xxx method that will be called for binding
     event = "evt_#{evt}"
     if self.respond_to?(event)
@@ -125,7 +126,12 @@ module EventConnector
     end
 
 
-    source_id = source ? source.get_id : Wx::ID_ANY
+    if source
+      source_id = source.get_id
+    else
+      source_id = -1
+    end
+
     begin
       # Some WxWidgest event connector methods expect the ID of the
       # triggering widget, others don't. So we try both ways to hide

data/lib/wx_sugar/keyword_classes.rb

@@ -6,7 +6,11 @@
 # to add a  missing class.
 
 # This is a dummy, this variable is not loaded until Wx init
+# hush warnings if it has already been loaded when we get here
+v = $VERBOSE
+$VERBOSE = nil
 Wx::NULL_BITMAP = nil
+$VERBOSE = v
 
 module WxSugar
   # accepts a string unadorned name of a WxWidgets class, and block, which 
@@ -35,13 +39,6 @@ end
 
 # wxTopLevelWindow 	ABSTRACT: Any top level window, dialog or frame
 
-# Dialog box
-WxSugar.define_keyword_ctors('Dialog') do
-  wx_ctor_params :title => ''
-  wx_ctor_params :pos, :size, :style => Wx::DEFAULT_DIALOG_STYLE
-  wx_ctor_params :name => 'dialogBox'
-end
-
 # Normal frame
 WxSugar.define_keyword_ctors('Frame') do
   wx_ctor_params :title => ''

data/lib/wx_sugar/keyword_constructors.rb

@@ -255,7 +255,6 @@ module KeywordConstructor
     # Any class inheriting from a class including this module must have
     # its own copy of the param_spec
     def klass.inherited(sub_klass)
-      # sub_klass.module_eval { include KeywordConstructor }
       sub_klass.instance_variable_set(:@param_spec, 
                                       self.instance_variable_get(:@param_spec) )
       sub_klass.instance_variable_set(:@param_flags, 

data/lib/wx_sugar/layout.rb

@@ -87,14 +87,25 @@ module Arranger
   def arrange(a_sizer, layout = {})
     # run as a subordinate block
     if block_given? and @current_sizer
+      if layout[:padding]
+        old_padding = @padding
+        @padding = layout[:padding] 
+      end
+
       superior_sizer, @current_sizer = @current_sizer, a_sizer
       yield(self)
       @current_sizer = superior_sizer
       proportion = layout[:proportion] || 0
       superior_sizer.add( a_sizer, proportion, 
-                          Wx::EXPAND|Wx::ALL|Wx::ADJUST_MINSIZE, padding)
+                          Wx::EXPAND|Wx::ALL|Wx::ADJUST_MINSIZE,
+                         padding)
+
+      if layout[:padding]
+        @padding = old_padding
+      end
     # set as main sizer            
     else
+      @padding = layout[:padding] if layout[:padding]
       @current_sizer = a_sizer
       yield(self) if block_given?
       self.set_sizer(a_sizer)
@@ -130,7 +141,6 @@ module Arranger
   end
   
   def arrange_linear( layout = { }, &block)
-    @padding = layout[:padding] if layout[:padding]
     if layout[:direction].to_s.downcase == 'horizontal'
       direction = Wx::HORIZONTAL
     elsif layout[:direction].to_s.downcase == 'vertical'
@@ -202,7 +212,7 @@ module Arranger
     if layout_hints[:minsize]
       layout = layout | Wx::ADJUST_MINSIZE|Wx::EXPAND
     end
-    if layout_hints[:expand] || layout_hints[:proportion]
+    if layout_hints[:proportion]
       layout = layout | Wx::EXPAND
     end
 

data/lib/wx_sugar/wx_classes.rb

@@ -0,0 +1,4 @@
+# Automatic loader for all the extensions to core Wx classes
+Dir.glob( __FILE__.sub(/\.rb$/, File::SEPARATOR + '*.rb' ) ).each do | f |
+  require 'wx_sugar/wx_classes/' + File.basename(f)
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: wx_sugar
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-09-07
+  version: 0.1.1
+date: 2006-09-15
 summary: Syntax extensions for WxRuby.
 require_paths: 
   - lib
@@ -37,6 +37,7 @@ files:
   - lib/wx_sugar/keyword_constructors.rb
   - lib/wx_sugar/layout.rb
   - lib/wx_sugar/menu.rb
+  - lib/wx_sugar/wx_classes.rb
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []