wxruby 1.9.5-i386-mswin32 → 1.9.7-i386-mswin32

data/lib/wx/classes/acceleratortable.rb

@@ -0,0 +1,28 @@
+class Wx::AcceleratorTable
+  # Allow new to be called as []
+  class << self
+    alias :[] :new
+  end
+
+  # Allow initialize to be called with a splat-like list of arguments,
+  # and allow entries to be specified in terser form [mod, key, id]
+  # rather than full AcceleratorEntry.new call.
+  wx_init = self.instance_method(:initialize)
+  define_method(:initialize) do | *args |
+    # Test for old-style arg passing in a single array
+    if args.length == 1 and args.first.kind_of?(Array) and
+       args.first.all? { | e | e.kind_of?(Wx::AcceleratorEntry) }
+      args = args[0]
+    end
+    # Convert to array of AccEntries, to pass in as single array
+    args = args.map do | entry |
+      case entry 
+      when Wx::AcceleratorEntry then entry
+      when Array then Wx::AcceleratorEntry.new(*entry)
+      else Kernel.raise ArgumentError,
+                        "#{entry.inspect} is not a valid AcceleratorTable entry"
+      end
+    end
+    wx_init.bind(self).call(args)
+  end
+end

data/lib/wx/classes/animation.rb

@@ -0,0 +1,18 @@
+class Wx::Animation < Wx::GDIObject
+  # Redefine the initialize method so it raises an exception if a
+  # non-existent file is given to the constructor; otherwise, wx Widgets
+  # just carries on with an empty bitmap, which may cause faults later
+  wx_init = self.instance_method(:initialize)
+  define_method(:initialize) do | *args |
+    if args[0].kind_of? String
+      if not File.exist?( File.expand_path(args[0]) )
+        Kernel.raise( ArgumentError, 
+                      "Animation file does not exist: #{args[0]}" )
+      end
+      res = wx_init.bind(self).call()
+      res.load_file(args[0], args[1] || Wx::ANIMATION_TYPE_ANY)
+    else
+      wx_init.bind(self).call(*args)
+    end
+  end
+end

data/lib/wx/classes/bitmap.rb

@@ -1,4 +1,9 @@
 class Wx::Bitmap
+  # Constructor copying data from an image
+  def self.from_image(img, depth = -1)
+    new(img, depth)
+  end
+
   # Redefine the initialize method so it raises an exception if a
   # non-existent file is given to the constructor; otherwise, wx Widgets
   # just carries on with an empty bitmap, which may cause faults later

data/lib/wx/classes/busycursor.rb

@@ -0,0 +1,12 @@
+# Emulates the wxWidgets BusyCursor class, by providing a scope within
+# which a busy cursor will be shown
+class Wx::BusyCursor
+  # Only one class method, optionally accepting a cursor that should be
+  # shown, defaulting to an hour glass cursor.
+  def self.busy(cursor = Wx::HOURGLASS_CURSOR)
+    Wx::begin_busy_cursor(cursor)
+    yield
+  ensure
+    Wx::end_busy_cursor
+  end
+end

data/lib/wx/classes/evthandler.rb

@@ -29,7 +29,9 @@ class Wx::EvtHandler
     if evt_klass = EVENT_TYPE_CLASS_MAP[id]
       return evt_klass
     else
-      warn "No event class defined for event type #{id}"
+      if Wx::DEBUG
+        warn "No event class defined for event type #{id}"
+      end
       return Wx::Event
     end
   end
@@ -42,11 +44,18 @@ class Wx::EvtHandler
 
   # Given the Integer constant Wx::EVT_XXX, returns the convenience
   # handler method name associated with that type of event.
-
   def self.event_name_for_type(name)
     EVENT_NAME_TYPE_MAP.index(name)
   end
 
+  # Given an integer value +int_val+, returns the name of the EVT_xxx
+  # constant which points to it. Mainly useful for debugging.
+  def self.const_to_name(int_val)
+    Wx::constants.grep(/^EVT/).find do | c_name |
+      Wx::const_get(c_name) == int_val
+    end
+  end
+
   # Public method to register the mapping of a custom event type
   # +konstant+ (which should be a unique integer; one will be created if
   # not supplied) to a custom event class +klass+. If +meth+ and +arity+
@@ -133,12 +142,15 @@ class Wx::EvtHandler
   # parameter or by calling the wx_id method of a passed Window.
   def acquire_id(window_or_id)
     case window_or_id
-    when Fixnum then window_or_id
-    when Wx::Window, Wx::MenuItem then window_or_id.wx_id
-    else Kernel.raise ArgumentError, 
-                     "Must specify Wx::Window event source or its Wx id, " +
-                     "not '#{window_or_id.inspect}'",
-                      caller
+    when Fixnum 
+      window_or_id
+    when Wx::Window, Wx::MenuItem, Wx::ToolBarTool 
+      window_or_id.wx_id
+    else 
+      Kernel.raise ArgumentError, 
+                   "Must specify Wx::Window event source or its Wx id, " +
+                   "not '#{window_or_id.inspect}'",
+                   caller
     end
   end
   private :acquire_id, :acquire_handler
@@ -258,30 +270,24 @@ class Wx::EvtHandler
     EventType['evt_combobox', 1,
               Wx::EVT_COMMAND_COMBOBOX_SELECTED, 
               Wx::CommandEvent],
-    EventType['evt_command', 0,
-              Wx::EVT_NULL, 
-              Wx::Event],
     EventType['evt_command_enter', 1,
               Wx::EVT_COMMAND_ENTER, 
-              Wx::Event],
+              Wx::CommandEvent],
     EventType['evt_command_kill_focus', 1,
               Wx::EVT_COMMAND_KILL_FOCUS, 
-              Wx::Event],
+              Wx::CommandEvent],
     EventType['evt_command_left_click', 1,
               Wx::EVT_COMMAND_LEFT_CLICK, 
-              Wx::Event],
+              Wx::CommandEvent],
     EventType['evt_command_left_dclick', 1,
               Wx::EVT_COMMAND_LEFT_DCLICK, 
-              Wx::Event],
-    EventType['evt_command_range', 2,
-              Wx::EVT_NULL, 
-              Wx::Event],
+              Wx::CommandEvent],
     EventType['evt_command_right_click', 1,
               Wx::EVT_COMMAND_RIGHT_CLICK, 
-              Wx::Event],
+              Wx::CommandEvent],
     EventType['evt_command_set_focus', 1,
               Wx::EVT_COMMAND_SET_FOCUS, 
-              Wx::Event],
+              Wx::CommandEvent],
     EventType['evt_context_menu', 0,
               Wx::EVT_CONTEXT_MENU, 
               Wx::ContextMenuEvent],
@@ -585,6 +591,9 @@ class Wx::EvtHandler
     EventType['evt_move', 0,
               Wx::EVT_MOVE, 
               Wx::MoveEvent],
+    EventType['evt_moving', 0,
+              Wx::EVT_MOVING, 
+              Wx::MoveEvent],
     EventType['evt_nc_paint', 0,
               Wx::EVT_NC_PAINT, 
               Wx::Event],
@@ -598,7 +607,7 @@ class Wx::EvtHandler
               Wx::EVT_PAINT, 
               Wx::PaintEvent],
     EventType['evt_query_end_session', 0,
-              Wx::EVT_QUERY_END_SESSION, 
+              Wx::EVT_QUERY_END_SESSION,
               Wx::Event],
     EventType['evt_query_layout_info', 0,
               Wx::EVT_QUERY_LAYOUT_INFO, 
@@ -687,6 +696,9 @@ class Wx::EvtHandler
     EventType['evt_set_focus', 0,
               Wx::EVT_SET_FOCUS, 
               Wx::FocusEvent],
+    EventType['evt_show', 1,
+              Wx::EVT_SHOW, 
+              Wx::ShowEvent],
     EventType['evt_size', 0,
               Wx::EVT_SIZE, 
               Wx::SizeEvent],
@@ -816,6 +828,9 @@ class Wx::EvtHandler
     EventType['evt_tree_item_expanding', 1,
               Wx::EVT_COMMAND_TREE_ITEM_EXPANDING, 
               Wx::TreeEvent],
+    EventType['evt_tree_item_gettooltip', 1,
+              Wx::EVT_COMMAND_TREE_ITEM_GETTOOLTIP, 
+              Wx::TreeEvent],
     EventType['evt_tree_item_menu', 1,
               Wx::EVT_COMMAND_TREE_ITEM_MENU, 
               Wx::TreeEvent],

data/lib/wx/classes/functions.rb

@@ -0,0 +1,44 @@
+# Tweaks to the global module functions
+
+module Wx
+  class << self
+    # Allow this to be called with keyword parameters, and avoid
+    # segfaults on OS X with bad params
+    wx_about_box = self.instance_method(:about_box)
+    define_method(:about_box) do | info |
+      # If AboutDialogInfo has no version, it segfaults on OS X 10.5
+      no_version = ArgumentError.new("Must supply a version for AboutDialog")
+      case info
+      when Wx::AboutDialogInfo
+        unless info.has_version
+          Kernel.raise no_version 
+        end
+
+        ab_info = info
+      when Hash
+        ab_info = Wx::AboutDialogInfo.new
+        ab_info.name    = info[:name] || 'wxRuby application'
+        ab_info.version = info[:version] || Kernel.raise(no_version)
+        
+        ab_info.description = info[:description] || ''
+        ab_info.copyright   = info[:copyright] || ''
+        ab_info.licence     = info[:licence] || ''
+        ab_info.developers  = info[:developers] || []
+        ab_info.doc_writers = info[:doc_writers] || []
+        ab_info.artists     = info[:artists] || []
+        ab_info.translators = info[:translators] || []
+        if info.key?(:website)
+          ab_info.set_website(*info[:website])
+        end
+        if info.key?(:icon)
+          ab_info.icon = info[:icon]
+        end
+
+      else
+        Kernel.raise ArgumentError,
+                     "Can't use #{info.inspect} for AboutDialogInfo"
+      end
+      wx_about_box.bind(self).call(ab_info)
+    end
+  end
+end

data/lib/wx/classes/grid.rb

@@ -4,15 +4,17 @@ class Wx::Grid
   # garbage collection of Grid-related classes; they do not extend the
   # public functionality of the class in any way. 
   # 
-  # The GridCellRenderers and GridCellEditors pose a problem for ruby's
-  # GC, in that Wx makes them owned by the grid once they have been set
-  # for a cell or group of cells. However, because they are SWIG
-  # directors we cannot allow the ruby object they are originally
-  # associated with to be swept by GC.
+  # GridTableBase, and the GridCellRenderers and GridCellEditors pose a
+  # problem for ruby's GC, in that Wx makes them owned by the grid once
+  # they have been set for a cell or group of cells. However, because
+  # they are SWIG directors we cannot allow the ruby object they are
+  # originally associated with to be swept by GC, as C++ method calls
+  # are routed to ruby method calls.
   #
   # The code below stores Ruby redefines all methods that may
-  # potentially set an Editor or Renderer, and stores a reference to
-  # it in an instance variable, so they are not disposed of up when GC sweeps.
+  # potentially set a GridTableBase, Editor or Renderer, and stores a
+  # reference to them in an instance variable, so they are not disposed
+  # of up when GC sweeps.
   
   # These all need to be set up as private methods which default to an
   # array. This can't be done in initialize b/c that may not be called
@@ -26,6 +28,13 @@ class Wx::Grid
     private meth
   end
 
+  # Set a grid table base to provide data
+  alias :__set_table :set_table
+  def set_table(table, sel_mode = Wx::Grid::GridSelectCells)
+    __set_table(table, sel_mode)
+    @__grid_table = table
+  end
+
   # store default editor
   wx_set_default_editor = self.instance_method(:set_default_editor)
   define_method(:set_default_editor) do | editr |

data/lib/wx/classes/htmlwindow.rb

@@ -3,4 +3,12 @@ class Wx::HtmlWindow
   def load_file(file)
     set_page( File.read(file) )
   end
+  
+  # This is called from within wxWidgets whenever a URL is being
+  # opened. The method may return true, to signal that the opening
+  # should be permitted, false or nil to signal that it should be
+  # blocked, or a string URL to which it should be redirected
+  def on_opening_url(url)
+    true
+  end
 end

data/lib/wx/classes/icon.rb

@@ -1,4 +1,11 @@
 class Wx::Icon
+  # Analogous to Image.from_bitmap
+  def self.from_bitmap(bmp)
+    ico = new
+    ico.copy_from_bitmap(bmp)
+    ico
+  end
+
   # Redefine the initialize method so it raises an exception if a
   # non-existent file is given to the constructor; otherwise, wx Widgets
   # just carries on with an empty icon, which may cause faults later

data/lib/wx/classes/iconbundle.rb

@@ -0,0 +1,3 @@
+class Wx::IconBundle
+  alias :<< :add_icon
+end

data/lib/wx/classes/image.rb

@@ -1,4 +1,16 @@
 class Wx::Image
+  # Load a new image from an IO-like object that supports "read"
+  def self.read(an_io, type_or_mime, index = -1)
+    img = new
+    img.load_stream(an_io, type_or_mime, index)
+    img
+  end
+
+  # Create a new image from Wx::Bitmap, preserving mask information
+  def self.from_bitmap(bmp)
+    bmp.convert_to_image
+  end
+
   # Redefine the initialize method so it raises an exception if a
   # non-existent file is given to the constructor; otherwise, wx Widgets
   # just carries on with an invalid image, which may cause faults later
@@ -11,4 +23,9 @@ class Wx::Image
     end
     wx_init.bind(self).call(*args)
   end
+  
+  # Convert to bitmap
+  def convert_to_bitmap
+    Wx::Bitmap.from_image(self)
+  end
 end

data/lib/wx/classes/imagelist.rb

@@ -0,0 +1,3 @@
+class Wx::ImageList
+  alias :<< :add
+end

data/lib/wx/classes/toolbartool.rb

@@ -0,0 +1,4 @@
+class Wx::ToolBarTool
+  alias :id :get_id
+  alias :wx_id :get_id
+end

data/lib/wx/classes/xmlresource.rb

@@ -1,4 +1,25 @@
 class Wx::XmlResource
+  # XRC_NO_SUBCLASSING should always be in place in wxRuby - we can't
+  # currently link directly to wxRuby subclasses.
+  class << self
+    wx_get = self.instance_method(:get)
+    define_method(:get) do 
+      res = wx_get.bind(self).call
+      res.flags |= Wx::XRC_NO_SUBCLASSING
+      res
+    end
+  end
+
+  # WxRuby already has all XRC handlers built in so there's no way to
+  # control init_all_handlers to reduce binary size. So save users
+  # having to call it.
+  wx_init = self.instance_method(:initialize)
+  define_method(:initialize) do | *args |
+    result = wx_init.bind(self).call(*args)
+    result.flags |= Wx::XRC_NO_SUBCLASSING
+    result.init_all_handlers
+  end
+
   # The standard .load method returns a boolean indicating success or
   # failure. Failure might result from bad XML, or a non-existent
   # file. In ruby, in these circumstances, it's more natural to raise an

data/lib/wx/keyword_ctors.rb

@@ -160,7 +160,7 @@ module Wx
       
       def describe_constructor()
         param_spec.inject("") do | desc, param |
-          desc << "#{param.name} (#{param.default.class.name})\n"
+          desc << ":#{param.name} => (#{param.default.class.name})\n"
         end
       end
     end
@@ -184,12 +184,15 @@ module Wx
           real_args = [ parent ] + self.class.args_as_list(*mixed_args)
           begin
             pre_wx_kwctor_init(*real_args)
-          rescue
-            msg = "Error initializing #{self.inspect} \n" +
-                  "Sent parameters: #{real_args.inspect}\n" +
-                   "Correct parameters are:\n" + 
+          rescue => err
+            msg = "Error initializing #{self.inspect}\n"+
+                  " : #{err.message} \n" +
+                  "Correct parameters for #{self.class.name}.new are:\n" + 
                    self.class.describe_constructor()
-            Kernel.raise ArgumentError, msg
+
+            new_err = err.class.new(msg)
+            new_err.set_backtrace(caller)
+            Kernel.raise new_err
           end
 
           # If a block was given, pass the newly created Window instance

data/lib/wx/keyword_defs.rb

@@ -483,3 +483,10 @@ Wx::define_keyword_ctors('SearchCtrl') do
   wx_ctor_params :validator, :name => 'searchCtrl'
 end
 
+
+Wx::define_keyword_ctors('AnimationCtrl') do
+  wx_ctor_params :id, :anim
+  wx_ctor_params :pos, :size, :style => Wx::AC_DEFAULT_STYLE
+  wx_ctor_params :name => 'animationCtrl'
+end
+

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '1.9.5'
+  WXRUBY_VERSION    = '1.9.7'
 end

data/samples/aui/aui.rb

@@ -1,17 +1,13 @@
 #!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2007 Kevin B. Smith
+# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
 # Freely reusable code: see SAMPLES-LICENSE.TXT for details
-
 begin
-  require 'wx'
-rescue LoadError => no_wx_err
-  begin
-    require 'rubygems' 
-    load 'wx'
-  rescue
-    raise no_wx_err
-  end
+  require 'rubygems' 
+rescue LoadError
 end
+require 'wx'
+
+
 
 # A resizable control that displays its current size, and, if an AUI
 # arrangement, its position and layer