wxruby 1.9.9-x86-mingw32 → 1.9.10-x86-mingw32

data/lib/wx.rb

@@ -1,53 +1,53 @@
-# Copyright 2004-2006 by Kevin Smith
-# released under the MIT-style wxruby2 license
-
-# This wrapper serves three functions:
-# 1. It loads the binary library 'wxruby2.so' or 'wxruby.dll', while
-#    still allowing applications to just require 'wx'.
-# 2. It sets up the version information
-# 3. It loads in ruby extensions to the core Wx classes.
-
-
-# load the binary library
-require 'wxruby2'
-
-# alias the module
-Wx = Wxruby2
-
-# Load the version information (should be bundled with all released versions)
-begin
-  require 'wx/version'
-rescue LoadError
-  Wx::WXRUBY_VERSION = '0.0.0'
-end
-# Convenience string for WxWidgets version info
-Wx::WXWIDGETS_VERSION = '%i.%i.%i' % [ Wx::WXWIDGETS_MAJOR_VERSION,
-                                       Wx::WXWIDGETS_MINOR_VERSION,
-                                       Wx::WXWIDGETS_RELEASE_NUMBER ]
-
-# Helper functions
-require 'wx/helpers'
-
-# Load in all the class extension methods written in ruby
-# evthandler must be required first b/c it sets up methods modified elsewhere
-require 'wx/classes/evthandler.rb'
-class_files = File.join( File.dirname(__FILE__), 'wx', 'classes', '*.rb')
-Dir.glob(class_files) do | class_file | 
-  require 'wx/classes/' + class_file[/\w+\.rb$/]
-end
-
-# Load in syntax sweeteners
-require 'wx/accessors'
-require 'wx/keyword_ctors'
-require 'wx/keyword_defs'
-
-# If a program is ended by ruby's exit, it can bypass doing the proper
-# Wx clean-up routines called by Wx::App#on_exit. This can under some
-# circumstances cause crashes as the application ends.
-Kernel::at_exit do
-  # These are set at App startup and wxRuby shut down respectively - see App.i
-  if Wx::const_defined?(:THE_APP) and not $__wx_app_ended__ 
-    Wx::THE_APP.on_exit
-  end
-end
-
+# Copyright 2004-2006 by Kevin Smith
+# released under the MIT-style wxruby2 license
+
+# This wrapper serves three functions:
+# 1. It loads the binary library 'wxruby2.so' or 'wxruby.dll', while
+#    still allowing applications to just require 'wx'.
+# 2. It sets up the version information
+# 3. It loads in ruby extensions to the core Wx classes.
+
+
+# load the binary library
+require 'wxruby2'
+
+# alias the module
+Wx = Wxruby2
+
+# Load the version information (should be bundled with all released versions)
+begin
+  require 'wx/version'
+rescue LoadError
+  Wx::WXRUBY_VERSION = '0.0.0'
+end
+# Convenience string for WxWidgets version info
+Wx::WXWIDGETS_VERSION = '%i.%i.%i' % [ Wx::WXWIDGETS_MAJOR_VERSION,
+                                       Wx::WXWIDGETS_MINOR_VERSION,
+                                       Wx::WXWIDGETS_RELEASE_NUMBER ]
+
+# Helper functions
+require 'wx/helpers'
+
+# Load in all the class extension methods written in ruby
+# evthandler must be required first b/c it sets up methods modified elsewhere
+require 'wx/classes/evthandler.rb'
+class_files = File.join( File.dirname(__FILE__), 'wx', 'classes', '*.rb')
+Dir.glob(class_files) do | class_file | 
+  require 'wx/classes/' + class_file[/\w+\.rb$/]
+end
+
+# Load in syntax sweeteners
+require 'wx/accessors'
+require 'wx/keyword_ctors'
+require 'wx/keyword_defs'
+
+# If a program is ended by ruby's exit, it can bypass doing the proper
+# Wx clean-up routines called by Wx::App#on_exit. This can under some
+# circumstances cause crashes as the application ends.
+Kernel::at_exit do
+  # These are set at App startup and wxRuby shut down respectively - see App.i
+  if Wx::const_defined?(:THE_APP) and not $__wx_app_ended__ 
+    Wx::THE_APP.on_exit
+  end
+end
+

data/lib/wx/classes/bitmap.rb

@@ -1,4 +1,25 @@
+# A platform-dependent image that can be drawn on the screen
 class Wx::Bitmap
+  # Allow wxRuby to guess the type of an image file from its extension.
+  BITMAP_TYPE_GUESS = { 
+    'bmp'  => Wx::BITMAP_TYPE_BMP,
+    'gif'  => Wx::BITMAP_TYPE_GIF,
+    'ico'  => Wx::BITMAP_TYPE_ICO,
+    'jpeg' => Wx::BITMAP_TYPE_JPEG,
+    'jpg'  => Wx::BITMAP_TYPE_JPEG,
+    'pbm'  => Wx::BITMAP_TYPE_PNM,
+    'pcx'  => Wx::BITMAP_TYPE_PCX,
+    'pgm'  => Wx::BITMAP_TYPE_PNM,
+    'png'  => Wx::BITMAP_TYPE_PNG,
+    'pnm'  => Wx::BITMAP_TYPE_PNM,
+    'ppm'  => Wx::BITMAP_TYPE_PNM,
+    'tga'  => Wx::BITMAP_TYPE_TGA,
+    'tif'  => Wx::BITMAP_TYPE_TIF,
+    'tiff' => Wx::BITMAP_TYPE_TIF,
+    'xbm'  => Wx::BITMAP_TYPE_XBM,
+    'xpm'  => Wx::BITMAP_TYPE_XPM
+  }
+
   # Constructor copying data from an image
   def self.from_image(img, depth = -1)
     new(img, depth)
@@ -6,13 +27,20 @@ class Wx::Bitmap
 
   # 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
+  # just carries on with an empty bitmap, which may cause faults
+  # later. Also, be helpful and try to guess the bitmap type from the
+  # filename if it's not specified
   wx_init = self.instance_method(:initialize)
   define_method(:initialize) do | *args |
+    # If creating from a file, check it exists
     if args[0].kind_of? String
       if not File.exist?( File.expand_path(args[0]) )
         Kernel.raise(ArgumentError, "Bitmap file does not exist: #{args[0]}")
       end
+      # If type not specified, try to guess it from the file extension
+      if not args[1] and file_ext = args[0][/\w+$/]
+        args[1] = BITMAP_TYPE_GUESS[file_ext.downcase]
+      end
     end
     wx_init.bind(self).call(*args)
   end

data/lib/wx/classes/clipboard.rb

@@ -1,16 +1,32 @@
 class Wx::Clipboard
+  # See if we like these better
+  alias :place :set_data
+  alias :fetch :get_data
+
   class << self
+    # This is provided internally by the SWIG interface file, but all
+    # public access should be via Clipboard.open; see below
+    private :get_global_clipboard
+
     # Class method to provide access to the clipboard within a ruby
     # block. Tests that the clipboard could be accessed, and ensures
     # that it is closed when the block is finished.
     def open
-      clip = Wx::Clipboard.new
+      clip = nil
+      # Trying to access the segfault outside main_loop will segfault on
+      # some platforms (eg, GTK)
+      unless Wx::const_defined?(:THE_APP)
+        raise RuntimeError, 
+              "The clipboard can only be accessed when the App is running"
+      end
+
+      clip = get_global_clipboard
       unless clip.open
         Kernel.raise "Could not open clipboard"
       end
       yield clip
-    ensure
-      clip.close
+     ensure
+       clip.close if clip
     end
   end
 end

data/lib/wx/classes/colour.rb

@@ -33,11 +33,13 @@ class Wx::Colour
   # Colours are equal to one another if they have the same red, green
   # and blue intensity, and the same alpha
   def ==(other)
-    if not other.is_a?(self.class)
-      raise ArgumentError, "No comparison of #{self} to #{other}"
-    end
-    [ red, green, blue, alpha ] == 
+    case other
+    when Wx::Colour
+      [  self.red,  self.green,  self.blue,  self.alpha ] == 
       [ other.red, other.green, other.blue, other.alpha ]
+    else
+      false
+    end
   end
 
   # More informative output for inspect etc

data/lib/wx/classes/data_object.rb

@@ -0,0 +1,14 @@
+# Provide some default implementations of these to make life easier
+class Wx::DataObject
+  def get_preferred_format(direction)
+    get_all_formats(direction).first
+  end
+
+  def get_format_count(direction)
+    get_all_formats(direction).length
+  end
+
+  def get_data_size(format)
+    get_data_here(format).size
+  end
+end

data/lib/wx/classes/data_object_simple.rb

@@ -0,0 +1,6 @@
+# Provide some default implementations of these to make life easier
+class Wx::DataObjectSimple
+  def get_data_size(format)
+    get_data_here(format).size
+  end
+end

data/lib/wx/classes/dataformat.rb

@@ -0,0 +1,23 @@
+# Make this easier to use for multi-typed data objects. Comparison
+# doesn't work correctly in the SWIG binding
+class Wx::DataFormat
+  def ==(other)
+    if self.get_type > Wx::DATA_FORMAT_ID_INVALID
+      self.get_type == other.get_type
+    else
+      self.id == other.id
+    end
+  end
+end
+
+# Provide pre-cooked data formats for the standard types
+module Wx
+  DF_TEXT        = DataFormat.new( DATA_FORMAT_ID_TEXT )
+  DF_BITMAP      = DataFormat.new( DATA_FORMAT_ID_BITMAP )
+  if Wx::PLATFORM != 'WXGTK'
+    DF_METAFILE    = DataFormat.new( DATA_FORMAT_ID_METAFILE )
+  end
+  DF_FILENAME    = DataFormat.new( DATA_FORMAT_ID_FILENAME )
+  DF_UNICODETEXT = DataFormat.new( DATA_FORMAT_ID_UNICODETEXT )
+  # DF_HTML is only supported on Windows + MSVC, so don't offer it
+end

data/lib/wx/classes/evthandler.rb

@@ -235,6 +235,12 @@ class Wx::EvtHandler
     EventType['evt_aui_render', 0,
               Wx::EVT_AUI_RENDER, 
               Wx::AuiManagerEvent],
+    EventType['evt_bookctrl_page_changed', 1,
+              Wx::EVT_COMMAND_BOOKCTRL_PAGE_CHANGED, 
+              Wx::BookCtrlBaseEvent],
+    EventType['evt_bookctrl_page_changing', 1,
+              Wx::EVT_COMMAND_BOOKCTRL_PAGE_CHANGING, 
+              Wx::BookCtrlBaseEvent],
     EventType['evt_button', 1,
               Wx::EVT_COMMAND_BUTTON_CLICKED, 
               Wx::CommandEvent],
@@ -313,15 +319,18 @@ class Wx::EvtHandler
     EventType['evt_context_menu', 0,
               Wx::EVT_CONTEXT_MENU, 
               Wx::ContextMenuEvent],
-    EventType['evt_drop_files', 0,
-              Wx::EVT_DROP_FILES, 
-              Wx::Event],
+    EventType['evt_date_changed', 1,
+              Wx::EVT_DATE_CHANGED, 
+              Wx::DateEvent],
     EventType['evt_detailed_help', 1,
               Wx::EVT_DETAILED_HELP, 
               Wx::HelpEvent],
     EventType['evt_detailed_help_range', 2,
               Wx::EVT_DETAILED_HELP, 
               Wx::HelpEvent],
+    EventType['evt_drop_files', 0,
+              Wx::EVT_DROP_FILES, 
+              Wx::Event],
     EventType['evt_end_process', 1,
               Wx::EVT_END_PROCESS, 
               Wx::Event],
@@ -864,10 +873,16 @@ class Wx::EvtHandler
               Wx::TimerEvent],
     EventType['evt_togglebutton', 1,
               Wx::EVT_COMMAND_TOGGLEBUTTON_CLICKED, 
-              Wx::Event],
+              Wx::CommandEvent],
     EventType['evt_tool', 1,
               Wx::EVT_COMMAND_TOOL_CLICKED, 
               Wx::CommandEvent],
+    EventType['evt_toolbook_page_changed', 1,
+              Wx::EVT_COMMAND_TOOLBOOK_PAGE_CHANGED, 
+              Wx::ToolbookEvent],
+    EventType['evt_toolbook_page_changing', 1,
+              Wx::EVT_COMMAND_TOOLBOOK_PAGE_CHANGING, 
+              Wx::ToolbookEvent],
     EventType['evt_tool_enter', 1,
               Wx::EVT_COMMAND_TOOL_ENTER, 
               Wx::CommandEvent],
@@ -943,6 +958,18 @@ class Wx::EvtHandler
     EventType['evt_tree_state_image_click', 1,
               Wx::EVT_COMMAND_TREE_STATE_IMAGE_CLICK, 
               Wx::TreeEvent],
+    EventType['evt_treebook_node_collapsed', 1,
+              Wx::EVT_COMMAND_TREEBOOK_NODE_COLLAPSED, 
+              Wx::TreebookEvent],
+    EventType['evt_treebook_node_expanded', 1,
+              Wx::EVT_COMMAND_TREEBOOK_NODE_EXPANDED, 
+              Wx::TreebookEvent],
+    EventType['evt_treebook_page_changed', 1,
+              Wx::EVT_COMMAND_TREEBOOK_PAGE_CHANGED, 
+              Wx::TreebookEvent],
+    EventType['evt_treebook_page_changing', 1,
+              Wx::EVT_COMMAND_TREEBOOK_PAGE_CHANGING, 
+              Wx::TreebookEvent],
     EventType['evt_update_ui', 1,
               Wx::EVT_UPDATE_UI, 
               Wx::UpdateUIEvent],

data/lib/wx/classes/genericdirctrl.rb

@@ -0,0 +1,36 @@
+# Bottom-up implementation of a Directory lister
+class Wx::GenericDirCtrl
+  module DirCtrlTree 
+    # The TreeCtrl contained in a GenericDirCtrl already has C++ data
+    # associated with the items. If these are returned to Ruby crashes
+    # will result. So this module sets the TreeCtrl to return the path
+    # string.
+    def get_item_data(tree_id)
+      root_id = get_root_item
+      return "" if tree_id == root_id
+
+      path = item_text(tree_id)
+      while tree_id = item_parent(tree_id) and tree_id != root_id
+        path = item_text(tree_id) + "/#{path}" 
+      end
+      unless Wx::PLATFORM == 'WXMSW'
+        path = "/" + path
+      end
+      path
+    end
+
+    alias :get_item_path :get_item_data
+
+    # Not allowed
+    def set_item_data(tree_id, data)
+      Kernel.raise "Item data cannot be set for a GenericDirCtrl's Tree"
+    end
+  end
+  
+  wx_get_tree_ctrl = instance_method(:get_tree_ctrl)
+  define_method(:get_tree_ctrl) do 
+    tree = wx_get_tree_ctrl.bind(self).call
+    tree.extend(DirCtrlTree)
+    tree
+  end
+end

data/lib/wx/classes/grid.rb

@@ -35,6 +35,14 @@ class Wx::Grid
     @__grid_table = table
   end
 
+  # Store the renderers / editors associated with types, if used
+  alias :__register_data_type :register_data_type
+  def register_data_type(type_name, renderer, editor)
+    __register_data_type(type_name, renderer, editor)
+    @__named_type_info ||= {}
+    @__named_type_info[type_name] = [ renderer, editor ]
+  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/hboxsizer.rb

@@ -0,0 +1,6 @@
+# Just a shortcut version for creating a horizontal box sizer
+class Wx::HBoxSizer < Wx::BoxSizer
+  def initialize
+    super(Wx::HORIZONTAL)
+  end
+end

data/lib/wx/classes/icon.rb

@@ -1,4 +1,10 @@
+# Specific type of platform-dependent image used for frames on Windows and
+# Linux. Normally Bitmap is used
 class Wx::Icon
+  # Load the type-guessing hash from Wx::Bitmap
+  require 'wx/classes/bitmap'
+  BITMAP_TYPE_GUESS = Wx::Bitmap::BITMAP_TYPE_GUESS
+
   # Analogous to Image.from_bitmap
   def self.from_bitmap(bmp)
     ico = new
@@ -8,13 +14,18 @@ class Wx::Icon
 
   # 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
+  # just carries on with an empty icon, which may cause faults
+  # later. Also guess icon type from filename, if not specified.
   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, "Icon file does not exist: #{args[0]}")
       end
+      # If type not specified, try to guess it from the file extension
+      if not args[1] and ( file_ext = args[0][/\w+$/] )
+        args[1] = BITMAP_TYPE_GUESS[file_ext.downcase]
+      end
     end
     wx_init.bind(self).call(*args)
   end

data/lib/wx/classes/image.rb

@@ -1,4 +1,10 @@
+# A platform-independent image; can be manipulated more extensively than
+# Bitmap, but must be converted to a Bitmap for drawing.
 class Wx::Image
+  # Load the type-guessing hash from Wx::Bitmap
+  require 'wx/classes/bitmap'
+  BITMAP_TYPE_GUESS = Wx::Bitmap::BITMAP_TYPE_GUESS
+
   # Load a new image from an IO-like object that supports "read"
   def self.read(an_io, type_or_mime, index = -1)
     img = new
@@ -13,13 +19,19 @@ class Wx::Image
 
   # 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
+  # just carries on with an invalid image, which may cause faults
+  # later. Also, if loading from a file, and the type is not specified,
+  # try to guess it from the filename extension
   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, "Image file does not exist: #{args[0]}")
       end
+      # If type not specified, try to guess it from the file extension
+      if not args[1] and file_ext = args[0][/\w+$/]
+        args[1] = BITMAP_TYPE_GUESS[file_ext.downcase]
+      end
     end
     wx_init.bind(self).call(*args)
   end