wxruby 1.9.2-i386-mswin32 → 1.9.3-i386-mswin32

data/lib/wx/classes/checklistbox.rb

@@ -1,30 +1,45 @@
-# Display a listbox with a checkbox for each item
-class Wx::CheckListBox < Wx::ListBox
-
-  # According to the wxWidgets documentation: "wxCheckListBox uses
-  # client data in its implementation, and therefore this is not
-  # available to the application."   
-  #
-  # So, rather than crashing, raise an Exception if this is attempted
-  def append(*args)
-    if args.length == 2 
-      Kernel.raise "Cannot use item data with Wx::CheckListBox"
-    else 
-      super
-    end
-  end
-
-  # As above
-  def insert(*args)
-    if args.length == 3
-      Kernel.raise "Cannot use item data with Wx::CheckListBox"
-    else 
-      super
-    end
-  end
-
-  # As above
-  def set_item_data(index, data)
-    Kernel.raise "Cannot use item data with Wx::CheckListBox"
-  end
-end
+# A ListBox, where each item has a checkbox next to it
+class Wx::CheckListBox
+  # wxRuby redefinitions of core methods to add item data support (not
+  # available in wxWidgets). Use a private method to initialize and
+  # access the data, rather than in initialize(), b/c can't guarantee
+  # that initialize will be called (eg when loaded from XRC)
+  def __wx_item_data
+    @__wx_item_data ||= []
+  end
+  private :__wx_item_data
+
+  # Call method in ControlWithItems, then sync item data
+  def append(item, data = nil)
+    super(item)
+    __wx_item_data[count - 1] = data
+  end
+
+  # Call method in ControlWithItems, then sync item data
+  def clear
+    super
+    __wx_item_data.clear
+  end
+
+  # delete is defined in Wx::CheckListBox, so must be called in this class
+  wx_delete = self.instance_method(:delete)
+  define_method(:delete) do | n |
+    wx_delete.bind(self).call(n)
+    __wx_item_data.delete_at(n)
+  end
+
+  # Returns an array of indices of items that are currently checked.
+  def get_checked_items
+    find_all { | i | checked?(i) }    
+  end
+  
+  # Wholly redefined here
+  def get_item_data(n)
+    __wx_item_data[n]
+  end
+
+  # Wholly redefined here
+  def set_item_data(n, data)
+    __wx_item_data[n] = data
+  end
+end

data/lib/wx/classes/clipboard.rb

@@ -0,0 +1,16 @@
+class Wx::Clipboard
+  class << self
+    # 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
+      unless clip.open
+        Kernel.raise "Could not open clipboard"
+      end
+      yield clip
+    ensure
+      clip.close
+    end
+  end
+end

data/lib/wx/classes/event.rb

@@ -0,0 +1,5 @@
+# Base class for all events
+class Wx::Event
+  # Get the Wx id, not Ruby's deprecated Object#id
+  alias :id :get_id
+end

data/lib/wx/classes/evthandler.rb

@@ -113,9 +113,9 @@ class Wx::EvtHandler
       return block
     elsif meth and not block
       h_meth = case meth
-        when Symbol, String : self.method(meth)
-        when Proc : meth
-        when Method : meth.to_proc
+        when Symbol, String then self.method(meth)
+        when Proc then meth
+        when Method then meth.to_proc
       end
       if h_meth.arity == 1
         return lambda { | evt | h_meth.call(evt) }
@@ -133,8 +133,8 @@ 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 : window_or_id
-    when Wx::Window, Wx::MenuItem : window_or_id.wx_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}'",
@@ -145,9 +145,13 @@ class Wx::EvtHandler
 
   # Definitions for all event types that are part by core wxRuby. Events
   # that are mapped to class Wx::Event are TODO as they are not
-  # currently wrapped by the correct class. All StyledTextCtrl
-  # (Scintilla) events with prefix EVT_STC are dealt with in the
-  # separate styledtextctrl.rb file.
+  # currently wrapped by the correct class. 
+
+  # All StyledTextCtrl (Scintilla) events with prefix EVT_STC are dealt
+  # with in the separate styledtextctrl.rb file.
+  # 
+  # All MediaCtrl events with prefix EVT_MEDIA are dealt with in the
+  # separate mediactrl.rb file
   EVENT_DEFINITIONS = [ 
     EventType['evt_activate', 0,
               Wx::EVT_ACTIVATE, 
@@ -202,7 +206,7 @@ class Wx::EvtHandler
               Wx::CommandEvent],
     EventType['evt_calculate_layout', 0,
               Wx::EVT_CALCULATE_LAYOUT, 
-              Wx::Event],
+              Wx::CalculateLayoutEvent],
     EventType['evt_calendar', 1,
               Wx::EVT_CALENDAR_DOUBLECLICKED, 
               Wx::CalendarEvent],
@@ -589,7 +593,7 @@ class Wx::EvtHandler
               Wx::Event],
     EventType['evt_query_layout_info', 0,
               Wx::EVT_QUERY_LAYOUT_INFO, 
-              Wx::Event],
+              Wx::QueryLayoutInfoEvent],
     EventType['evt_radiobox', 1,
               Wx::EVT_COMMAND_RADIOBOX_SELECTED, 
               Wx::CommandEvent],
@@ -662,6 +666,12 @@ class Wx::EvtHandler
     EventType['evt_scroll_top', 0,
               Wx::EVT_SCROLL_TOP, 
               Wx::ScrollEvent],
+    EventType['evt_searchctrl_cancel_btn', 1,
+              Wx::EVT_COMMAND_SEARCHCTRL_CANCEL_BTN,
+              Wx::CommandEvent],
+    EventType['evt_searchctrl_search_btn', 1,
+              Wx::EVT_COMMAND_SEARCHCTRL_SEARCH_BTN,
+              Wx::CommandEvent],
     EventType['evt_set_cursor', 0,
               Wx::EVT_SET_CURSOR, 
               Wx::SetCursorEvent],

data/lib/wx/classes/grid.rb

@@ -13,21 +13,19 @@ class Wx::Grid
   # 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.
-  wx_init = self.instance_method(:initialize)
-  define_method(:initialize) do | *args |
-    wx_init.bind(self).call(*args)
-    @__default_editor   = nil
-    @__default_renderer = nil
-
-    @__cell_editors   = []
-    @__cell_renderers = []
-
-    @__col_renderers = []
-    @__col_editors   = []
-    @__row_renderers = []
-    @__row_editors   = []
-  end
   
+  # 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
+  # when a Grid is loaded from XRC
+  %w| __cell_editors   __col_editors   __row_editors
+      __cell_renderers __col_renderers __row_renderers |.each do | meth |
+    define_method(meth) do
+      instance_variable_get("@#{meth}") || 
+        instance_variable_set("@#{meth}", [])
+    end
+    private meth
+  end
+
   # store default editor
   wx_set_default_editor = self.instance_method(:set_default_editor)
   define_method(:set_default_editor) do | editr |
@@ -46,38 +44,39 @@ class Wx::Grid
   wx_set_cell_editor = self.instance_method(:set_cell_editor)
   define_method(:set_cell_editor) do | row, col, editr |
     wx_set_cell_editor.bind(self).call(row, col, editr)
-    @__cell_editors[row] ||= []
-    @__cell_editors[row][col] = editr
+    __cell_editors[row] ||= []
+    __cell_editors[row][col] = editr
    end
 
   # store cell renderer
   wx_set_cell_renderer = self.instance_method(:set_cell_renderer)
   define_method(:set_cell_renderer) do | row, col, rendr |
     wx_set_cell_renderer.bind(self).call(row, col, rendr)
-    @__cell_renderers[row] ||= []
-    @__cell_renderers[row][col] = rendr
+    __cell_renderers[row] ||= []
+    __cell_renderers[row][col] = rendr
   end
 
+  # Store an editor and/or renderer for a whole column
   wx_set_col_attr = self.instance_method(:set_col_attr)
   define_method(:set_col_attr) do | col, attr |
     wx_set_col_attr.bind(self).call(col, attr)
     if attr.has_editor
-      @__col_editors[col] = attr.get_editor(self, 0, col)
+      __col_editors[col] = attr.get_editor(self, 0, col)
     end
     if attr.has_renderer
-      @__col_renderers[col] = attr.get_renderer(self, 0, col)
+      __col_renderers[col] = attr.get_renderer(self, 0, col)
     end
   end  
 
+  # Store an editor and/or renderer for a whole row
   wx_set_row_attr = self.instance_method(:set_row_attr)
   define_method(:set_row_attr) do | row, attr |
     wx_set_row_attr.bind(self).call(row, attr)
     if attr.has_editor
-      @__row_editors[row] = attr.get_editor(self, row, 0)
+      __row_editors[row] = attr.get_editor(self, row, 0)
     end
-
     if attr.has_renderer
-      @__row_renderers[row] = attr.get_renderer(self, row, 0)
+      __row_renderers[row] = attr.get_renderer(self, row, 0)
     end
   end  
 
@@ -87,44 +86,44 @@ class Wx::Grid
   alias :__insert_rows :insert_rows
   def insert_rows(pos = 0, num = 1, update_labels = true)
     __insert_rows(pos, num, update_labels)
-    num.times { @__row_editors.insert(pos, nil) }
-    num.times { @__row_renderers.insert(pos, nil) }
-    num.times { @__cell_editors.insert(pos, []) }
-    num.times { @__cell_renderers.insert(pos, []) }
+    num.times { __row_editors.insert(pos, nil) }
+    num.times { __row_renderers.insert(pos, nil) }
+    num.times { __cell_editors.insert(pos, []) }
+    num.times { __cell_renderers.insert(pos, []) }
   end
   
   alias :__insert_cols :insert_cols
   def insert_cols(pos = 0, num = 1, update_labels = true)
     __insert_cols(pos, num, update_labels)
-    num.times { @__col_editors.insert(pos, nil) }
-    num.times { @__col_renderers.insert(pos, nil) }
+    num.times { __col_editors.insert(pos, nil) }
+    num.times { __col_renderers.insert(pos, nil) }
     num.times do
-      @__cell_editors.map { | col | col.insert(pos, []) if col }
+      __cell_editors.map { | col | col.insert(pos, []) if col }
     end
     num.times do
-      @__cell_renderers.map { | col | col.insert(pos, []) if col }
+      __cell_renderers.map { | col | col.insert(pos, []) if col }
     end
   end
 
   alias :__delete_rows :delete_rows
   def delete_rows(pos = 0, num = 1, update_labels = true)
     __delete_rows(pos, num, update_labels)
-    @__row_editors.slice!(pos, num)
-    @__row_renderers.slice!(pos, num)
-    @__cell_editors.slice!(pos, num)
-    @__cell_renderers.slice!(pos, num)
+    __row_editors.slice!(pos, num)
+    __row_renderers.slice!(pos, num)
+    __cell_editors.slice!(pos, num)
+    __cell_renderers.slice!(pos, num)
   end
  
   alias :__delete_cols :delete_cols
   def delete_cols(pos = 0, num = 1, update_labels = true)
     __delete_cols(pos, num, update_labels)
-    @__col_editors.slice!(pos, num)
-    @__col_renderers.slice!(pos, num)
+    __col_editors.slice!(pos, num)
+    __col_renderers.slice!(pos, num)
     num.times do
-      @__cell_editors.map { | col | col.slice!(pos, num) if col }
+      __cell_editors.map { | col | col.slice!(pos, num) if col }
     end
     num.times do
-      @__cell_renderers.map { | col | col.slice!(pos, num) if col }
+      __cell_renderers.map { | col | col.slice!(pos, num) if col }
     end
   end
 end

data/lib/wx/classes/listctrl.rb

@@ -6,4 +6,16 @@ class Wx::ListCtrl
   def each
     0.upto(item_count - 1) { | i | yield i }
   end
+
+  # Stub version for LC_VIRTUAL controls that does nothing; may be
+  # overridden in subclasses.
+  def on_get_item_attr(i)
+    nil
+  end
+
+  # Stub version for LC_VIRTUAL|LC_REPORT controls that does nothing;
+  # may be overridden in subclasses.
+  def on_get_item_column_image(i, col)
+    -1
+  end
 end

data/lib/wx/classes/mediactrl.rb

@@ -0,0 +1,22 @@
+# Functionality here must be loaded first to add custom events
+require 'wx/classes/evthandler'
+
+# These event handlers should only be defined if MediaCtrl is actually
+# available; some builds may not include it
+if defined?(Wx::MediaCtrl)
+  evt_type = Wx::EvtHandler::EventType
+  mediactrl_event_types = [
+    evt_type['evt_media_finished', 1,
+              Wx::EVT_MEDIA_FINISHED,
+              Wx::MediaEvent],
+    evt_type['evt_media_stop', 1,
+              Wx::EVT_MEDIA_STOP,
+              Wx::MediaEvent],
+    evt_type['evt_media_loaded', 1,
+              Wx::EVT_MEDIA_LOADED,
+              Wx::MediaEvent]
+  ]
+  mediactrl_event_types.each do | ev_type | 
+    Wx::EvtHandler.register_event_type(ev_type)
+  end
+end

data/lib/wx/classes/menu.rb

@@ -23,9 +23,9 @@ class Wx::Menu
         old_meth = instance_method(meth)
         define_method(meth) do | *args |
           case args.first
-            when Fixnum : old_meth.bind(self).call(*args)
-            when String : old_meth.bind(self).call(Wx::ID_ANY, *args)
-            when Wx::MenuItem : old_meth.bind(self).call(args.first)
+            when Fixnum then old_meth.bind(self).call(*args)
+            when String then old_meth.bind(self).call(Wx::ID_ANY, *args)
+            when Wx::MenuItem then old_meth.bind(self).call(args.first)
           end
         end
       end
@@ -46,9 +46,9 @@ class Wx::Menu
         old_meth = instance_method(meth)
         define_method(meth) do | pos, *args |
           case args.first
-            when Fixnum : old_meth.bind(self).call(pos, *args)
-            when String : old_meth.bind(self).call(pos, Wx::ID_ANY, *args)
-            when Wx::MenuItem : old_meth.bind(self).call(pos, args.first)
+            when Fixnum then old_meth.bind(self).call(pos, *args)
+            when String then old_meth.bind(self).call(pos, Wx::ID_ANY, *args)
+            when Wx::MenuItem then old_meth.bind(self).call(pos, args.first)
           end
         end
       end

data/lib/wx/classes/sound.rb

@@ -0,0 +1,23 @@
+# Plays simple sounds from .wav files
+class Wx::Sound
+  class << self
+    # Shortcut class method, as per the wxWidgets docs, but easier to do
+    # in Ruby
+    def play(file, flags = Wx::SOUND_ASYNC)
+      new(file).play(flags)
+    end
+  end
+
+  # Test if newly created Sound is valid; if not, raise an exception
+  # rather than failing silently.
+  wx_init = self.instance_method(:initialize)
+  define_method(:initialize) do | *args |
+    if not File.exist?( File.expand_path(args[0]) )
+      Kernel.raise(ArgumentError, "Sound file does not exist: #{args[0]}")
+    end
+    wx_init.bind(self).call(*args)
+    if not ok?
+      Kernel.raise(ArgumentError, "Error loading sound file #{args[0]}")
+    end
+  end
+end

data/lib/wx/classes/styledtextctrl.rb

@@ -8,7 +8,7 @@ require 'wx/classes/evthandler'
 if defined?(Wx::StyledTextCtrl)
   EventType = Wx::EvtHandler::EventType
 
-  STC_EVENT_TYPES = [ 
+  stc_event_types = [ 
     EventType['evt_stc_calltip_click', 1,
               Wx::EVT_STC_CALLTIP_CLICK, 
               Wx::StyledTextEvent],
@@ -86,7 +86,7 @@ if defined?(Wx::StyledTextCtrl)
               Wx::StyledTextEvent]
     ]
 
-  STC_EVENT_TYPES.each do | ev_type | 
+  stc_event_types.each do | ev_type | 
     Wx::EvtHandler.register_event_type(ev_type)
   end
 end

data/lib/wx/classes/treectrl.rb

@@ -15,4 +15,30 @@ class Wx::TreeCtrl
     end
     kids
   end
+
+  # Returns a Wx::Rect corresponding to the edges of an individual tree
+  # item, including the button, identified by id. The standard wxWidgets
+  # API for getting the pixel location of an item is unrubyish, using an
+  # input/output parameter. But since the underlying get_bounding_rect
+  # method works, it's easier to fix the API in Ruby than adding more to
+  # the already-toxic swig interface TreeCtrl.i file.
+  def get_item_rect(tree_item_id)
+    rect = Wx::Rect.new
+    if get_bounding_rect(tree_item_id, rect, false)
+      return rect
+    else
+      return nil
+    end
+  end
+
+  # Returns a Wx::Rect corresponding to the edges of an individual tree
+  # item's text label. See above.
+  def get_label_rect(tree_item_id)
+    rect = Wx::Rect.new
+    if get_bounding_rect(tree_item_id, rect, true)
+      return rect
+    else
+      nil
+    end
+  end
 end

data/lib/wx/keyword_ctors.rb

@@ -135,8 +135,8 @@ module Wx
         # get keyword arguments from mixed args if supplied, else empty
         kwa = mixed_args.last.kind_of?(Hash) ? mixed_args.pop : {}
         out_args = []
-        param_spec.zip(mixed_args) do | param, arg |
-          if arg # use the supplied list arg 
+        param_spec.each_with_index do | param, i |
+          if arg = mixed_args[i] # use the supplied list arg 
             out_args << arg
           elsif kwa.key?(param.name) # use the keyword arg
             out_args << kwa[param.name]
@@ -171,7 +171,10 @@ module Wx
 
         alias :pre_wx_kwctor_init :initialize
 
-        def initialize(parent = :default_ctor, *mixed_args)
+        # The new definition of initialize; accepts a parent arg
+        # mixed_args, which may zero or more position args, optionally
+        # terminated with hash keyword args, and an optional block
+        def initialize(parent = :default_ctor, *mixed_args, &block)
           # allow zero-args ctor for use with XRC
           if parent == :default_ctor
             pre_wx_kwctor_init()
@@ -188,8 +191,19 @@ module Wx
                    self.class.describe_constructor()
             Kernel.raise ArgumentError, msg
           end
-          
-          yield self if block_given?
+
+          # If a block was given, pass the newly created Window instance
+          # into it; use block
+          if block
+            if block.arity == -1 or block.arity == 0
+              self.instance_eval(&block)
+            elsif block.arity == 1
+              block.call(self)
+            else 
+              Kernel.raise ArgumentError, 
+                           "Block to initialize accepts zero or one arg"
+            end
+          end
         end
       end
       

data/lib/wx/keyword_defs.rb

@@ -428,6 +428,13 @@ Wx::define_keyword_ctors('SpinButton') do
    wx_ctor_params :name => 'spinButton'
 end
 
+# wxScrollBar - standalone scrollbar with arrows and thumb 
+Wx::define_keyword_ctors('ScrollBar') do 
+   wx_ctor_params :id, :pos, :size, :style => Wx::SB_HORIZONTAL
+   wx_ctor_params :validator, :name => 'scrollBar'
+end
+
+
 # wxVListBox 	A listbox supporting variable height rows
 
 # wxTextCtrl 	Single or multiline text editing control
@@ -463,3 +470,16 @@ Wx::define_keyword_ctors('CollapsiblePane') do
   wx_ctor_params :validator, :name => 'collapsiblePane'
 end
 
+Wx::define_keyword_ctors('MediaCtrl') do
+  wx_ctor_params :id, :filename => ''
+  wx_ctor_params :pos, :size, :style => 0
+  wx_ctor_params :backend => ''
+  wx_ctor_params :validator, :name => 'mediaCtrl'
+end
+
+Wx::define_keyword_ctors('SearchCtrl') do
+  wx_ctor_params :id, :value => ''
+  wx_ctor_params :pos, :size, :style => 0
+  wx_ctor_params :validator, :name => 'searchCtrl'
+end
+

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '1.9.2'
+  WXRUBY_VERSION    = '1.9.3'
 end

data/lib/wx.rb

@@ -1,42 +1,42 @@
-# 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 ]
-
-
-# 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 sweetner
-require 'wx/accessors'
-require 'wx/keyword_ctors'
-require 'wx/keyword_defs'
-
-
+# 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 ]
+
+
+# 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 sweetner
+require 'wx/accessors'
+require 'wx/keyword_ctors'
+require 'wx/keyword_defs'
+
+

data/samples/SAMPLES-LICENSE.TXT

@@ -1,18 +1,18 @@
-wxRuby2 Sample Code
-Copyright (c) 2004-2006 Kevin B. Smith
-
-Permission is hereby granted, free of charge, to any person obtaining 
-a copy of this 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 any portion of 
-this Software, and to permit persons to whom the Software is furnished
-to do so. This copyright notice need not be retained in any derived
-work.
-
-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
+wxRuby2 Sample Code
+Copyright (c) 2004-2006 Kevin B. Smith
+
+Permission is hereby granted, free of charge, to any person obtaining 
+a copy of this 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 any portion of 
+this Software, and to permit persons to whom the Software is furnished
+to do so. This copyright notice need not be retained in any derived
+work.
+
+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.