wxruby3 0.9.0.pre.beta.11-x64-mingw-ucrt → 0.9.0.pre.beta.13-x64-mingw-ucrt

data/lib/wx/core/rect.rb

@@ -36,15 +36,40 @@ class Wx::Rect
     end
   end
 
-  # make sure union and intersect are constant operations, i.e. not changing self
-  wx_union = instance_method :union
-  define_method :union do |rect|
-    wx_union.bind(Wx::Rect.new(*self.to_ary)).call(rect)
+  # provide both constant and non-constant versions of union/intersect/inflate/deflate/offset
+
+  # first alias the wrapped (non-constant) versions with correct names
+  alias :union! :union
+  alias :intersect! :intersect
+  alias :inflate! :inflate
+  alias :deflate! :deflate
+
+  # redefine offset as offset! returning self
+  wx_offset = instance_method :offset
+  define_method :offset! do |*args|
+    wx_offset.bind(self).call(*args)
+    self
+  end
+
+  # next provide new constant versions
+  def offset(*args)
+    self.dup.offset!(*args)
+  end
+
+  def union(rect)
+    self.dup.union!(rect)
+  end
+
+  def intersect(rect)
+    self.dup.intersect!(rect)
+  end
+
+  def inflate(*args)
+    self.dup.inflate!(*args)
   end
 
-  wx_intersect = instance_method :intersect
-  define_method :intersect do |rect|
-    wx_intersect.bind(Wx::Rect.new(*self.to_ary)).call(rect)
+  def deflate(*args)
+    self.dup.deflate!(*args)
   end
 
   alias :+ :add
@@ -54,4 +79,14 @@ class Wx::Rect
 
   # More ruby-ish names
   alias :contains? :contains
+
+  def dup
+    Wx::Rect.new(self.x, self.y, self.width, self.height)
+  end
+
+  def assign(rct)
+    self.position = rct.position
+    self.size = rct.size
+    self
+  end
 end

data/lib/wx/core/region_iterator.rb

@@ -0,0 +1,37 @@
+
+class Wx::RegionIterator
+
+  alias :have_rects? :have_rects
+
+  # Ruby like enumeration
+  def each
+    if block_given?
+      while have_rects
+        yield get_rect
+        next_rect
+      end
+    else
+      # The region iterator instance cannot be allowed to exist beyond the outer
+      # Wx::RegionIterator.for_region block as it is a temporary instance that
+      # will stop to exist when the outer block finishes, so we collect the rectangles
+      # here and return an enumerator on that
+      arr = []
+      while has_rects
+        arr << get_rect
+        next_rect
+      end
+      arr.each
+    end
+  end
+
+  def self.iterate(region, &block)
+    return unless block
+    for_region(region) do |ri|
+      while ri.have_rects
+        block.call(ri)
+        ri.next_rect
+      end
+    end
+  end
+
+end

data/lib/wx/core/size.rb

@@ -2,6 +2,12 @@ class Wx::Size
 
   include Comparable
 
+  # provide compatibility methods
+  alias :get_x :get_width
+  alias :x :get_width
+  alias :get_y :get_height
+  alias :y :get_height
+
   # More informative output for inspect etc
   def to_s
     "#<Wx::Size: #{width}x#{height}>"
@@ -90,4 +96,18 @@ class Wx::Size
       end
     end
   end
+
+  def dup
+    Wx::Size.new(self.width, self.height)
+  end
+
+  def to_size
+    self
+  end
+
+  def assign(sz)
+    self.width = sz.width
+    self.height = sz.height
+    self
+  end
 end

data/lib/wx/core/window.rb

@@ -53,43 +53,20 @@ class Wx::Window
   def evt_paint(meth = nil, &block)
     paint_proc = acquire_handler(meth, block)
     wrapped_block = proc do | event |
-      instance_variable_set("@__painting__", true)
+      instance_variable_set('@__painting__', true)
       paint_proc.call(event)
-      remove_instance_variable("@__painting__")
+      remove_instance_variable('@__painting__')
     end
     __old_evt_paint(&wrapped_block)
   end
 
-  # Provides bufferd drawing facility to reduce flicker for complex
-  # drawing commands. Works similar to BufferedDC and BufferedPaintDC in
-  # the wxWidgets API, by doing drawing on an in-memory Bitmap, then
-  # copying the result in bulk to the screen.
-  #
-  # The method may be passed an existing Wx::Bitmap as the +buffer+,
-  # otherwise one will be created.
-  #
-  # Works like wxAutoBufferedDC in that additional buffering will only
-  # be done on platforms that do not already natively support buffering
-  # for the standard PaintDC / ClientDC - Windows, in particular.
-  def paint_buffered(buffer = nil)
-    # OS X and GTK do double-buffering natively
-    if self.double_buffered?
-      paint { | dc | yield dc }
+  # Overload the wrapper method to check for @__painting__
+  wx_paint_buffered = instance_method :paint_buffered
+  define_method :paint_buffered do |&block|
+    if instance_variable_defined?('@__painting__')
+      wx_paint_buffered.bind(self).call(&block)
     else
-      # client_size is the window area available for drawing upon
-      c_size = client_size
-      # Create an in-memory buffer if none supplied
-      buffer ||= Wx::Bitmap.new(c_size.width, c_size.height)
-      buffer.draw do | mem_dc |
-        mem_dc.background = Wx::TRANSPARENT_BRUSH
-        mem_dc.clear
-        # Yield the bitmap for the user code to draw upon
-        yield mem_dc
-        paint do | dc |
-          # Copy the buffer to the window
-          dc.blit(0, 0, c_size.width, c_size.height, mem_dc, 0, 0)
-        end
-      end
+      self.paint(&block)
     end
   end
 end

data/lib/wx/doc/array_ext.rb

@@ -0,0 +1,27 @@
+
+module Wx
+
+  # Mixin module providing Array extensions.
+  module ArrayExt
+
+    # Returns a new Wx::Size instance created from the first two elements of the array.
+    # Any missing element will be supplemented by a Wx::DEFAULT_COORD value.
+    # The array is not altered.
+    # @return [Wx::Size]
+    def to_size; end
+
+    # Returns a new Wx::Point instance created from the first two elements of the array.
+    # Any missing element will be supplemented by a Wx::DEFAULT_COORD value.
+    # The array is not altered.
+    # @return [Wx::Point]
+    def to_point; end
+
+    # Returns a new Wx::RealPoint instance created from the first two elements of the array.
+    # Any missing element will be supplemented by a Wx::DEFAULT_COORD value.
+    # The array is not altered.
+    # @return [Wx::RealPoint]
+    def to_real_point; end
+
+  end
+
+end

data/lib/wx/doc/art_locator.rb

@@ -0,0 +1,57 @@
+
+
+# This module provides and standardizes support for locating application art files.
+#
+module Wx::ArtLocator
+
+  # Default name of art folder.
+  ART_FOLDER = 'art'
+
+  class << self
+
+    # Returns the base name for the folder holding application art files.
+    # By default this returns ART_FOLDER
+    # @return [String]
+    def art_folder; end
+
+    # Sets the base name for the folder holding application art files.
+    # @param [String] name art folder base name
+    def art_folder=(name) end
+
+    # Adds one or more search paths to look for art files.
+    # By default ArtLocator#find_art will look only at locations of the caller's
+    # file path. If search paths have been added though these will be searched
+    # after the lookup in the caller's path has failed.
+    def add_search_path(*names) end
+    alias :add_search_paths :add_search_path
+
+    # Searches for the an art file for the given 'art_name'.
+    # By default the search will be performed at the following locations (in order):
+    # 1. <art_path>/<#art_folder>/<art_section>/<art_type>/
+    # 2. <art_path>/<#art_folder>/<art_section>/
+    # 3. <art_path>/<#art_folder>/
+    # 4. <art_path>/
+    # Where 'art_type' is any of <code>:icon</code>, <code>:bitmap</code>, <code>:cursor</code>,
+    # <code>:image</code> or <code>nil</code>. If 'art_type' is nil the first location will be skipped.
+    # In case 'art_path' == <code>nil</code> the absolute path to the folder holding the caller's
+    # code will be used which is determined through ::Kernel#caller_locations.
+    # If 'art_section' is also <code>nil</code> the basename of the caller's source file will be used.
+    # At each location the existence of a file with base name 'art_name' and each of the supported
+    # extensions for the given 'art_type' (see wxWidgets documentation) will be tested. If 'art_type' is nil
+    # all extensions for all supported bitmap types will be tested (similar to when 'art_type' is :image).
+    # If an optional Wx::BitmapType is specified through 'bmp_type' the tested extensions will
+    # be restricted to the extensions supported for specified the bitmap type.
+    #
+    # In case additional search paths have been specified through #add_search_path these will be
+    # searched after the lookup at 'art_path' fails. For each search path the same lookups
+    # will be performed (replacing 'art_path' by the search path).
+    # @param [String,Symbol] art_name base name for art file
+    # @param [Symbol,nil] art_type type of art to look for (:icon, :bitmap, :cursor, :image)
+    # @param [String,nil] art_path base path to look up the art file
+    # @param [String,nil] art_section optional owner folder name for art files
+    # @param [Wx::BitmapType,nil] bmp_type bitmap type of art file
+    def find_art(art_name, art_type: nil, art_path: nil, art_section: nil, bmp_type: nil) end
+
+  end
+
+end

data/lib/wx/doc/bitmap.rb

@@ -0,0 +1,27 @@
+
+module Wx
+
+  # Default BitmapType for current platform. Actual value is platform dependent.
+  ICON_DEFAULT_TYPE = Wx::BitmapType::BITMAP_TYPE_ANY
+  # Default BitmapType for current platform. Actual value is platform dependent.
+  BITMAP_DEFAULT_TYPE = Wx::BitmapType::BITMAP_TYPE_ANY
+  # Default BitmapType for current platform. Actual value is platform dependent.
+  CURSOR_DEFAULT_TYPE = Wx::BitmapType::BITMAP_TYPE_ANY
+
+  class Bitmap
+
+    # Searches for an art file with basename 'name' and creates a Bitmap if found.
+    # Raises an ArgumentError if not found.
+    # Wx::ArtLocator::find_art is used to look up the art file using ::Kernel#caller_locations to
+    # determine the values for the 'art_path' and 'art_owner' arguments ('art_path' is set to the
+    # absolute path to the folder holding the caller's code and 'art_owner' to the basename of the
+    # caller's source file). The 'art_type' argument is set to <code>:icon</code>.
+    # @param [String,Symbol] name base name of art file
+    # @param [Wx::BitmapType,nil] bmp_type bitmap type for art file (nil means any supported type)
+    # @return [Wx::Bitmap]
+    # @see Wx::ArtLocator::find_art
+    def self.Bitmap(name, bmp_type = nil); end
+
+  end
+
+end

data/lib/wx/doc/clipboard.rb

@@ -0,0 +1,12 @@
+
+class Wx::Clipboard
+
+  alias :place :set_data
+  alias :fetch :get_data
+
+  # Opens the global clipboard and passes the clipboard object to the block.
+  # @yieldparam [Wx::Clipboard] clip the global clipboard object
+  # @return [Object] block result
+  def self.open; end
+
+end

data/lib/wx/doc/const.rb

@@ -0,0 +1,77 @@
+module Wx
+
+=begin
+  These constants are not documented in the wxWidgets interface headers
+  although they are referenced in various argument defaults which *are*
+  in the interface header declarations so we do want them included the
+  wxRuby docs so the doc links work but we do not need them in the
+  wxRuby implementation since these are internal to the C++ wrappers.
+=end
+
+  DefaultDateTimeFormat = '%c'
+  DefaultTimeSpanFormat = '%H:%M:%S'
+
+  ChoiceNameStr = 'choice'
+  ColourPickerCtrlNameStr = 'colourpicker'
+  ColourPickerWidgetNameStr = 'colourpickerwidget'
+  HyperlinkCtrlNameStr = 'hyperlink'
+  PanelNameStr = 'panel'
+  ListBoxNameStr = 'listBox'
+  FrameNameStr = 'frame'
+  StatusLineNameStr = 'status_line'
+  StaticBitmapNameStr = 'staticBitmap'
+  WebViewNameStr = 'wxWebView'
+  AnimationCtrlNameStr = 'animationctrl'
+  ToolBarNameStr = 'toolbar'
+  TextCtrlNameStr = 'text'
+  ListCtrlNameStr = 'listCtrl'
+  FilePickerCtrlNameStr = 'filepicker'
+  FilePickerWidgetNameStr = 'filepickerwidget'
+  DirPickerCtrlNameStr = 'dirpicker'
+  DirPickerWidgetNameStr = 'dirpickerwidget'
+  FileCtrlNameStr = 'wxfilectrl'
+  StaticBoxNameStr = 'groupBox'
+  ButtonNameStr = 'button'
+  RadioBoxNameStr = 'radioBox'
+  StaticLineNameStr = 'staticLine'
+  RadioButtonNameStr = 'radioButton'
+  BitmapRadioButtonNameStr = 'radioButton'
+  GaugeNameStr = 'gauge'
+  DataViewCtrlNameStr = 'dataviewCtrl'
+  FontPickerCtrlNameStr = 'fontpicker'
+  FontPickerWidgetNameStr = 'fontpickerwidget'
+  RearrangeListNameStr = 'wxRearrangeList'
+  RearrangeDialogNameStr = 'wxRearrangeDlg'
+  NotebookNameStr = 'notebook'
+  ControlNameStr = 'control'
+  ScrollBarNameStr = 'scrollBar'
+  StatusBarNameStr = 'statusBar'
+  SliderNameStr = 'slider'
+  HeaderCtrlNameStr = 'wxHeaderCtrl'
+  BitmapComboBoxNameStr = 'bitmapComboBox'
+  CheckBoxNameStr = 'check'
+  FileDialogNameStr = 'filedlg'
+  AddRemoveCtrlNameStr = 'wxAddRemoveCtrl'
+  StaticTextNameStr = 'staticText'
+  ComboBoxNameStr = 'comboBox'
+  SearchCtrlNameStr = 'searchCtrl'
+  DirDialogNameStr = 'wxDirCtrl'
+  TreeCtrlNameStr = 'treeCtrl'
+  DialogNameStr = 'dialog'
+  CollapsibleHeaderCtrlNameStr = 'collapsibleHeader'
+  CollapsiblePaneNameStr = 'collapsiblePane'
+  BannerWindowNameStr = 'bannerwindow'
+  GridNameStr = 'grid'
+  TreeListCtrlNameStr = 'wxTreeListCtrl'
+  HtmlListBoxNameStr = 'htmlListBox'
+  SimpleHtmlListBoxNameStr = 'simpleHtmlListBox'
+  EditableListBoxNameStr = 'editableListBox'
+  VListBoxNameStr = 'wxVListBox'
+  CollapsiblePaneNameStr = 'collapsiblePane'
+  MSWHeaderCtrlNameStr = 'wxMSWHeaderCtrl'
+  PropertyGridManagerNameStr = 'wxPropertyGridManager'
+  PropertyGridNameStr = 'wxPropertyGrid'
+  STCNameStr = 'stcwindow'
+  STCNameStr = 'stcwindow'
+
+end

data/lib/wx/doc/cursor.rb

@@ -0,0 +1,16 @@
+
+class Wx::Cursor
+
+  # Searches for an art file with basename 'name' and creates a Cursor if found.
+  # Raises an ArgumentError if not found.
+  # Wx::ArtLocator::find_art is used to look up the art file using ::Kernel#caller_locations to
+  # determine the values for the 'art_path' and 'art_owner' arguments ('art_path' is set to the
+  # absolute path to the folder holding the caller's code and 'art_owner' to the basename of the
+  # caller's source file). The 'art_type' argument is set to <code>:icon</code>.
+  # @param [String,Symbol] name base name of art file
+  # @param [Wx::BitmapType,nil] bmp_type bitmap type for art file (nil means any supported type)
+  # @return [Wx::Cursor]
+  # @see Wx::ArtLocator::find_art
+  def self.Cursor(name, bmp_type = nil); end
+
+end

data/lib/wx/doc/data_object.rb

@@ -80,8 +80,7 @@ module Wx
     # The default implementation calls #_get_data and determines the size of the returned data string (if any).
     # As this is not very optimal for more complex (and larger data objects) very often this method will be
     # overridden in derived classes.
-    # @note **IMPORTANT** Please note that it is necessary to return the **size in bytes** of the data string
-    # returned by #_get_data (not the size in characters).
+    # @note **IMPORTANT** Please note that it is necessary to return the **size in bytes** of the data string returned by #_get_data (not the size in characters).
     # @return [Integer]
     def _get_data_size; end
     protected :_get_data_size

data/lib/wx/doc/dc.rb

@@ -1,49 +1,66 @@
 
-class Wx::DC
-
-  # Provides similar functionality like wxDCBrushChanger setting the given brush as the active
-  # brush for the DC for the duration of the block execution restoring the previous brush afterwards.
-  # @param [Wx::Brush] brush new brush to use during block execution
-  # @return [void]
-  # @yieldparam [Wx::DC] dc the DC (self)
-  def with_brush(brush) end
-
-  # Provides similar functionality like wxDCPenChanger setting the given pen as the active
-  # pen for the DC for the duration of the block execution restoring the previous pen afterwards.
-  # @param [Wx::Pen] pen new pen to use during block execution
-  # @return [void]
-  # @yieldparam [Wx::DC] dc the DC (self)
-  def with_pen(pen) end
-
-  # Provides similar functionality like wxDCFontChanger setting the given font as the active
-  # font for the DC for the duration of the block execution restoring the previous font afterwards.
-  # @param [Wx::Font] font new font to use during block execution
-  # @return [void]
-  # @yieldparam [Wx::DC] dc the DC (self)
-  def with_font(font) end
-
-  # Provides similar functionality like wxDCTextColourChanger setting the given colour as the active
-  # text foreground colour for the DC for the duration of the block execution restoring the previous colour afterwards.
-  # @param [Wx::Colour] clr new colour to use during block execution
-  # @return [void]
-  # @yieldparam [Wx::DC] dc the DC (self)
-  def with_text_foreground(clr) end
-  alias :with_text_fg :with_text_foreground
-
-  # Provides similar functionality like wxDCTextBgColourChanger setting the given colour as the active
-  # text background colour for the DC for the duration of the block execution restoring the previous colour afterwards.
-  # @param [Wx::Colour] clr new colour to use during block execution
-  # @return [void]
-  # @yieldparam [Wx::DC] dc the DC (self)
-  def with_text_background(clr) end
-  alias :with_text_bg :with_text_background
-
-  # Provides similar functionality like wxDCTextBgModeChanger setting the given mode as the active
-  # background mode for the DC for the duration of the block execution restoring the previous mode afterwards.
-  # @param [Integer] mode new mode to use during block execution
-  # @return [void]
-  # @yieldparam [Wx::DC] dc the DC (self)
-  def with_background_mode(mode) end
-  alias :with_bg_mode :with_background_mode
+module Wx
+  class DC
+
+    # Provides similar functionality like wxDCBrushChanger setting the given brush as the active
+    # brush for the DC for the duration of the block execution restoring the previous brush afterwards.
+    # @param [Wx::Brush] brush new brush to use during block execution
+    # @return [void]
+    # @yieldparam [Wx::DC] dc the DC (self)
+    def with_brush(brush) end
+
+    # Provides similar functionality like wxDCPenChanger setting the given pen as the active
+    # pen for the DC for the duration of the block execution restoring the previous pen afterwards.
+    # @param [Wx::Pen] pen new pen to use during block execution
+    # @return [void]
+    # @yieldparam [Wx::DC] dc the DC (self)
+    def with_pen(pen) end
+
+    # Provides similar functionality like wxDCFontChanger setting the given font as the active
+    # font for the DC for the duration of the block execution restoring the previous font afterwards.
+    # @param [Wx::Font] font new font to use during block execution
+    # @return [void]
+    # @yieldparam [Wx::DC] dc the DC (self)
+    def with_font(font) end
+
+    # Provides similar functionality like wxDCTextColourChanger setting the given colour as the active
+    # text foreground colour for the DC for the duration of the block execution restoring the previous colour afterwards.
+    # @param [Wx::Colour] clr new colour to use during block execution
+    # @return [void]
+    # @yieldparam [Wx::DC] dc the DC (self)
+    def with_text_foreground(clr) end
+    alias :with_text_fg :with_text_foreground
+
+    # Provides similar functionality like wxDCTextBgColourChanger setting the given colour as the active
+    # text background colour for the DC for the duration of the block execution restoring the previous colour afterwards.
+    # @param [Wx::Colour] clr new colour to use during block execution
+    # @return [void]
+    # @yieldparam [Wx::DC] dc the DC (self)
+    def with_text_background(clr) end
+    alias :with_text_bg :with_text_background
+
+    # Provides similar functionality like wxDCTextBgModeChanger setting the given mode as the active
+    # background mode for the DC for the duration of the block execution restoring the previous mode afterwards.
+    # @param [Integer] mode new mode to use during block execution
+    # @return [void]
+    # @yieldparam [Wx::DC] dc the DC (self)
+    def with_background_mode(mode) end
+    alias :with_bg_mode :with_background_mode
+
+  end
+
+  class MemoryDC
+
+    # Creates a Memory DC and passes that to the given block to draw on.
+    # Automatically unselects any source object of the MemoryDC after the block finishes.
+    # @overload self.draw_on(bitmap)
+    #   @param [Wx::Bitmap]
+    #   @yieldparam [WxMemoryDC] dc
+    # @overload self.draw_on(dc)
+    #   @param [Wx::DC]
+    #   @yieldparam [WxMemoryDC] dc
+    def self.draw_on(arg, &block) end
+
+  end
 
 end

data/lib/wx/doc/event.rb

@@ -0,0 +1,24 @@
+
+module Wx
+
+  class Event
+
+    # Constructor
+    # @param [Integer] evt_type
+    # @param [Integer] id
+    # @param [Wx::EventPropagation] prop_level
+    def initialize(evt_type = Wx::EVT_NULL, id = 0, prop_level = Wx::EVENT_PROPAGATE_NONE) end
+
+    # Returns a copy of the event.
+    # Any event that is posted to the wxRuby event system for later action (via {Wx::EvtHandler#add_pending_event},
+    # {Wx::EvtHandler#queue_event} or {Wx::EvtHandler#post_event}) must implement this method.
+    # All standard wxRuby events fully implement this method and wxRuby has taken care of correctly handling this
+    # for any user defined event classes derived from either Wx::Event or Wx::CommandEvent.
+    # Creating user defined event classes derived for other classes than Wx::Event or Wx::CommandEvent is currently
+    # *not* supported in wxRuby.
+    # @return [Wx::Event]
+    def clone; end
+
+  end
+
+end

data/lib/wx/doc/events.rb

@@ -0,0 +1,14 @@
+
+module Wx
+
+  EVT_COMMAND_SCROLL_TOP = EVT_SCROLL_TOP         
+  EVT_COMMAND_SCROLL_BOTTOM = EVT_SCROLL_BOTTOM      
+  EVT_COMMAND_SCROLL_LINEUP = EVT_SCROLL_LINEUP      
+  EVT_COMMAND_SCROLL_LINEDOWN = EVT_SCROLL_LINEDOWN    
+  EVT_COMMAND_SCROLL_PAGEUP = EVT_SCROLL_PAGEUP      
+  EVT_COMMAND_SCROLL_PAGEDOWN = EVT_SCROLL_PAGEDOWN    
+  EVT_COMMAND_SCROLL_THUMBTRACK = EVT_SCROLL_THUMBTRACK  
+  EVT_COMMAND_SCROLL_THUMBRELEASE = EVT_SCROLL_THUMBRELEASE
+  EVT_COMMAND_SCROLL_CHANGED = EVT_SCROLL_CHANGED     
+  
+end

data/lib/wx/doc/evthandler.rb

@@ -65,11 +65,26 @@ class Wx::EvtHandler
 
   # Convenience evt_handler to listen to all mouse events.
   # @yieldparam [Wx::MouseEvent] event event to handle
-  def evt_mouse_events(&block) end
+  def evt_mouse_events(*args, &block) end
 
-  # Convenience evt handler to listen to all scrollwin events.
+  # Convenience evt handler to listen to all scrollwin events
+  # (from Wx::ScrolledWindow).
+  # @param [String,Symbol,Method,Proc] meth (name of) method or event handling proc
+  # @yieldparam [Wx::ScrollWinEvent] event event to handle
+  def evt_scrollwin(meth = nil, &block) end
+
+  # Convenience evt handler to listen to all scroll events
+  # (from Wx::Slider and Wx::ScrollBar).
+  # @param [String,Symbol,Method,Proc] meth (name of) method or event handling proc
+  # @yieldparam [Wx::ScrollWinEvent] event event to handle
+  def evt_scroll(meth = nil, &block) end
+
+  # Convenience evt handler to listen to all scroll events
+  # (from Wx::Slider and Wx::ScrollBar) with an id.
+  # @param [Integer] id window identifier
+  # @param [String,Symbol,Method,Proc] meth (name of) method or event handling proc
   # @yieldparam [Wx::ScrollWinEvent] event event to handle
-  def evt_scrollwin(&block) end
+  def evt_scroll_command(id, meth = nil, &block) end
 
   # Processes Wx::WindowDestroyEvent events.
   # In wxRuby Wx::Event#skipped will be forced to true after the provided
@@ -78,6 +93,12 @@ class Wx::EvtHandler
   # @yieldparam [Wx::WindowDestroyEvent] event event to handle
   def evt_window_destroy(&block) end
 
+  # Processes {Wx::EVT_TIMER} events. See {Wx::TimerEvent}.
+  # @param [Integer,Wx::Enum,Wx::Timer] id timer id
+  # @param [String,Symbol,Method,Proc] meth (name of) method or event handling proc
+  # @yieldparam [Wx::TimerEvent] event the event to handle
+  def evt_timer(id, meth = nil, &block) end
+
   # Schedule a call for asynchronous execution (at idle time).
   # @param meth [Symbol,String,Method,Proc] (name of) method or proc to call
   # @param args [Array<Object>] optional arguments to pass to the call

data/lib/wx/doc/extra/00_starting.md

@@ -151,4 +151,4 @@ distributes implementations over various sub-modules. These sub-modules can be l
 The core module still provides the toplevel `Wx` namespace and all classes and constants declared in that namespace.
 All other modules add to that (and **all** require the core module).
 
-See [here](packages.md) for more details on wxRuby sub-modules.
+See [here](01_packages.md) for more details on wxRuby sub-modules.