wxruby3 0.9.0.pre.rc.2-x64-mingw-ucrt → 0.9.0.pre.rc.3-x64-mingw-ucrt

data/lib/wx/doc/gen/sash_window.rb

@@ -12,17 +12,22 @@ module Wx
   # === Styles
   # 
   # This class supports the following styles:
-  #  
+  # 
   # - {Wx::SW_3D}: Draws a 3D effect sash and border. 
+  # 
   # - {Wx::SW_3DSASH}: Draws a 3D effect sash. 
+  # 
   # - {Wx::SW_3DBORDER}: Draws a 3D effect border. 
+  # 
   # - {Wx::SW_BORDER}: Draws a thin black border. 
   # 
   # === Events emitted by this class
   # 
   # The following event-handler methods redirect the events to member method or handler blocks for {Wx::SashEvent} events.
   # Event handler methods for events emitted by this class:
+  # 
   # - {Wx::EvtHandler#evt_sash_dragged}(id, meth = nil, &block): Process a {Wx::EVT_SASH_DRAGGED} event, when the user has finished dragging a sash. 
+  # 
   # - {Wx::EvtHandler#evt_sash_dragged_range}(id1,  id2, meth = nil, &block): Process a {Wx::EVT_SASH_DRAGGED_RANGE} event, when the user has finished dragging a sash. The event handler is called when windows with ids in the given range have their sashes dragged. 
   # 
   # === 
@@ -37,7 +42,7 @@ module Wx
   
     # @overload initialize()
     #   Default ctor.
-    #   @return [SashWindow]
+    #   @return [Wx::SashWindow]
     # @overload initialize(parent, id, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=(Wx::CLIP_CHILDREN|wxSW_3D), name=("sashWindow"))
     #   Constructs a sash window, which can be a child of a frame, dialog or any other non-control window.
     #   @param parent [Wx::Window]  Pointer to a parent window.
@@ -46,7 +51,7 @@ module Wx
     #   @param size [Array(Integer, Integer), Wx::Size]  Window size. {Wx::DEFAULT_SIZE} is (-1, -1) which indicates that {Wx::SashWindows} should generate a default size for the window.
     #   @param style [Integer]  Window style. For window styles, please see {Wx::SashWindow}.
     #   @param name [String]  Window name.
-    #   @return [SashWindow]
+    #   @return [Wx::SashWindow]
     def initialize(*args) end
     
     # Gets the maximum window size in the x direction.

data/lib/wx/doc/gen/scroll_bar.rb

@@ -13,33 +13,54 @@ module Wx
   # === Styles
   # 
   # This class supports the following styles:
-  #  
+  # 
   # - {Wx::SB_HORIZONTAL}: Specifies a horizontal scrollbar. 
+  # 
   # - {Wx::SB_VERTICAL}: Specifies a vertical scrollbar. 
   # 
   # === Events emitted by this class
   # 
   # The following event-handler methods redirect the events to member method or handler blocks for {Wx::ScrollEvent} events.
   # Event handler methods for events emitted by this class: except for this, the macros behave exactly the same. 
+  # 
   # - {Wx::EvtHandler#evt_scroll}(meth = nil, &block): Process all scroll events. 
+  # 
   # - {Wx::EvtHandler#evt_scroll_top}(meth = nil, &block): Process {Wx::EVT_SCROLL_TOP} scroll to top or leftmost (minimum) position events. 
+  # 
   # - {Wx::EvtHandler#evt_scroll_bottom}(meth = nil, &block): Process {Wx::EVT_SCROLL_BOTTOM} scroll to bottom or rightmost (maximum) position events. 
+  # 
   # - {Wx::EvtHandler#evt_scroll_lineup}(meth = nil, &block): Process {Wx::EVT_SCROLL_LINEUP} line up or left events. 
+  # 
   # - {Wx::EvtHandler#evt_scroll_linedown}(meth = nil, &block): Process {Wx::EVT_SCROLL_LINEDOWN} line down or right events. 
+  # 
   # - {Wx::EvtHandler#evt_scroll_pageup}(meth = nil, &block): Process {Wx::EVT_SCROLL_PAGEUP} page up or left events. 
+  # 
   # - {Wx::EvtHandler#evt_scroll_pagedown}(meth = nil, &block): Process {Wx::EVT_SCROLL_PAGEDOWN} page down or right events. 
+  # 
   # - {Wx::EvtHandler#evt_scroll_thumbtrack}(meth = nil, &block): Process {Wx::EVT_SCROLL_THUMBTRACK} thumbtrack events (frequent events sent as the user drags the thumbtrack). 
+  # 
   # - {Wx::EvtHandler#evt_scroll_thumbrelease}(meth = nil, &block): Process {Wx::EVT_SCROLL_THUMBRELEASE} thumb release events. 
+  # 
   # - {Wx::EvtHandler#evt_scroll_changed}(meth = nil, &block): Process {Wx::EVT_SCROLL_CHANGED} end of scrolling events (MSW only). 
+  # 
   # - {Wx::EvtHandler#evt_command_scroll}(id, meth = nil, &block): Process all scroll events. 
+  # 
   # - {Wx::EvtHandler#evt_command_scroll_top}(id, meth = nil, &block): Process {Wx::EVT_SCROLL_TOP} scroll to top or leftmost (minimum) position events. 
+  # 
   # - {Wx::EvtHandler#evt_command_scroll_bottom}(id, meth = nil, &block): Process {Wx::EVT_SCROLL_BOTTOM} scroll to bottom or rightmost (maximum) position events. 
+  # 
   # - {Wx::EvtHandler#evt_command_scroll_lineup}(id, meth = nil, &block): Process {Wx::EVT_SCROLL_LINEUP} line up or left events. 
+  # 
   # - {Wx::EvtHandler#evt_command_scroll_linedown}(id, meth = nil, &block): Process {Wx::EVT_SCROLL_LINEDOWN} line down or right events. 
+  # 
   # - {Wx::EvtHandler#evt_command_scroll_pageup}(id, meth = nil, &block): Process {Wx::EVT_SCROLL_PAGEUP} page up or left events. 
+  # 
   # - {Wx::EvtHandler#evt_command_scroll_pagedown}(id, meth = nil, &block): Process {Wx::EVT_SCROLL_PAGEDOWN} page down or right events. 
+  # 
   # - {Wx::EvtHandler#evt_command_scroll_thumbtrack}(id, meth = nil, &block): Process {Wx::EVT_SCROLL_THUMBTRACK} thumbtrack events (frequent events sent as the user drags the thumbtrack). 
+  # 
   # - {Wx::EvtHandler#evt_command_scroll_thumbrelease}(meth = nil, &block): Process {Wx::EVT_SCROLL_THUMBRELEASE} thumb release events. 
+  # 
   # - {Wx::EvtHandler#evt_command_scroll_changed}(meth = nil, &block): Process {Wx::EVT_SCROLL_CHANGED} end of scrolling events (MSW only). 
   # 
   # == The difference between EVT_SCROLL_THUMBRELEASE and EVT_SCROLL_CHANGED
@@ -49,9 +70,9 @@ module Wx
   # In short, the EVT_SCROLL_CHANGED event is triggered when scrolling/moving has finished independently of the way it had started. Please see the Widgets Sample ("Slider" page) to see the difference between EVT_SCROLL_THUMBRELEASE and EVT_SCROLL_CHANGED in action.
   # === 
   # 
-  # Category:  {Wx::Controls}  <div class='appearance'><span class='appearance'>Appearance:</span><table><tr><td> {Wx::MSW} Appearance
-  #   </td><td> {Wx::GTK} Appearance
-  #   </td><td> {Wx::OSX} Appearance
+  # Category:  {Wx::Controls}  <div class='appearance'><span class='appearance'>Appearance:</span><table><tr><td> wxMSW Appearance
+  #   </td><td> wxGTK Appearance
+  #   </td><td> wxOSX Appearance
   #   </td></tr></table></div>
   # @see Scrolled Windows
   # @see  Events and Event Handling
@@ -62,7 +83,7 @@ module Wx
   
     # @overload initialize()
     #   Default constructor.
-    #   @return [ScrollBar]
+    #   @return [Wx::ScrollBar]
     # @overload initialize(parent, id, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=Wx::SB_HORIZONTAL, validator=Wx::DEFAULT_VALIDATOR, name=Wx::ScrollBarNameStr)
     #   Constructor, creating and showing a scrollbar.
     #   
@@ -75,7 +96,7 @@ module Wx
     #   @param style [Integer]  Window style. See {Wx::ScrollBar}.
     #   @param validator [Wx::Validator]  Window validator.
     #   @param name [String]  Window name.
-    #   @return [ScrollBar]
+    #   @return [Wx::ScrollBar]
     def initialize(*args) end
     
     # Scrollbar creation function called by the scrollbar constructor.
@@ -120,8 +141,8 @@ module Wx
     
     # Sets the scrollbar properties.
     # Let's say you wish to display 50 lines of text, using the same font. The window is sized so that you can only see 16 lines at a time. You would use: 
-    # ```
-    #   scrollbar->SetScrollbar(0, 16, 50, 15);
+    # ```ruby
+    #   scrollbar.set_scrollbar(0, 16, 50, 15)
     # ```
     #  The page size is 1 less than the thumb size so that the last line of the previous page will be visible on the next page, to help orient the user. Note that with the window at this size, the thumb position can never go above 50 minus 16, or 34. You can determine how many lines are currently visible by dividing the current view size by the character height in pixels. When defining your own scrollbar behaviour, you will always need to recalculate the scrollbar settings when the window size changes. You could therefore put your scrollbar calculations and {Wx::ScrollBar#set_scrollbar} call into a function named AdjustScrollbars, which can be called initially and also from a {Wx::SizeEvent} event handler function.
     # @param position [Integer]  The position of the scrollbar in scroll units.

data/lib/wx/doc/gen/scrolled_canvas.rb

@@ -9,7 +9,8 @@ module Wx
   # The {Wx::Scrolled} class manages scrolling for its client area, transforming the coordinates according to the scrollbar positions, and setting the scroll positions, thumb sizes and ranges according to the area in view.
   # There are two commonly used (but not the only possible!) specializations of this class:
   # 
-  # - {Wx::ScrolledWindow}, aka {Wx::Scrolled}<{Wx::Panel}>, is equivalent to {Wx::ScrolledWindow} from earlier versions. Derived from {Wx::Panel}, it shares {Wx::Panel}'s behaviour with regard to TAB traversal and focus handling. Use this if the scrolled window will have child controls.- {Wx::ScrolledCanvas}, aka {Wx::Scrolled}<{Wx::Window}>, derives from {Wx::Window} and so doesn't handle children specially. This is suitable e.g. for implementing scrollable controls such as tree or list controls.
+  # - {Wx::ScrolledWindow}, aka {Wx::Scrolled}<{Wx::Panel}>, is equivalent to {Wx::ScrolledWindow} from earlier versions. Derived from {Wx::Panel}, it shares {Wx::Panel}'s behaviour with regard to TAB traversal and focus handling. Use this if the scrolled window will have child controls.
+  # - {Wx::ScrolledCanvas}, aka {Wx::Scrolled}<{Wx::Window}>, derives from {Wx::Window} and so doesn't handle children specially. This is suitable e.g. for implementing scrollable controls such as tree or list controls.
   # 
   # See Wx::Scrolled#create if you want to use {Wx::Scrolled} with a custom class.
   # 
@@ -28,24 +29,36 @@ module Wx
   # === Styles
   # 
   # This class supports the following styles:
-  #  
+  # 
   # - {Wx::HSCROLL}: If this style is specified and {Wx::VSCROLL} isn't, the window will be scrollable only in horizontal direction (by default, i.e. if neither this style nor {Wx::VSCROLL} is specified, it scrolls in both directions). 
+  # 
   # - {Wx::VSCROLL}: If this style is specified and {Wx::HSCROLL} isn't, the window will be scrollable only in vertical direction (by default, i.e. if neither this style nor {Wx::HSCROLL} is specified, it scrolls in both directions). 
+  # 
   # - {Wx::ALWAYS_SHOW_SB}: Since wxWidgets 2.9.5, specifying this style makes the window always show its scrollbars, even if they are not used. See Wx::Scrolled#show_scrollbars. 
+  # 
   # - {Wx::RETAINED}: Uses a backing pixmap to speed refreshes. Motif only. 
   # 
   # === Events emitted by this class
   # 
   # The following event-handler methods redirect the events to member method or handler blocks for {Wx::ScrollWinEvent} events.
   # Event handler methods for events emitted by this class:
+  # 
   # - {Wx::EvtHandler#evt_scrollwin}(meth = nil, &block): Process all scroll events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_top}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_TOP} scroll-to-top events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_bottom}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_BOTTOM} scroll-to-bottom events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_lineup}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_LINEUP} line up events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_linedown}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_LINEDOWN} line down events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_pageup}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_PAGEUP} page up events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_pagedown}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_PAGEDOWN} page down events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_thumbtrack}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_THUMBTRACK} thumbtrack events (frequent events sent as the user drags the thumbtrack). 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_thumbrelease}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_THUMBRELEASE} thumb release events. 
   # 
   # Don't confuse {Wx::ScrollWinEvents} generated by this class with {Wx::ScrollEvent} objects generated by {Wx::ScrollBar} and {Wx::Slider}.
@@ -68,7 +81,7 @@ module Wx
   
     # @overload initialize()
     #   Default constructor.
-    #   @return [Scrolled]
+    #   @return [Wx::Scrolled]
     # @overload initialize(parent, id=-1, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=(Wx::HSCROLL|Wx::VSCROLL), name=("scrolledWindow"))
     #   Constructor.
     #   The window is initially created without visible scrollbars. Call Wx::Scrolled#set_scrollbars to specify how big the virtual window size should be.
@@ -78,7 +91,7 @@ module Wx
     #   @param size [Array(Integer, Integer), Wx::Size]  Window size. If a size of {Wx::DEFAULT_SIZE} is specified then the window is sized appropriately.
     #   @param style [Integer]  Window style. See {Wx::Scrolled}.
     #   @param name [String]  Window name.
-    #   @return [Scrolled]
+    #   @return [Wx::Scrolled]
     def initialize(*args) end
     
     # @overload calc_scrolled_position(x, y)
@@ -125,22 +138,24 @@ module Wx
     # Call this function to prepare the device context for drawing a scrolled image.
     # It sets the device origin according to the current scroll position. Wx::Scrolled#do_prepare_dc is called automatically within the default {Wx::EVT_PAINT} event handler, so your Wx::Scrolled#on_draw override will be passed an already 'pre-scrolled' device context. However, if you wish to draw from outside of Wx::Scrolled#on_draw (e.g. from your own {Wx::EVT_PAINT} handler), you must call this function yourself.
     # For example: 
-    # ```
-    #   void MyWindow::OnEvent(wxMouseEvent& event)
-    #   {
-    #     wxClientDC dc(this);
-    #     DoPrepareDC(dc);
-    #   
-    #     dc.SetPen(*wxBLACK_PEN);
-    #     float x, y;
-    #     event.Position(&x, &y);
-    #     if (xpos > -1 && ypos > -1 && event.Dragging())
-    #     {
-    #       dc.DrawLine(xpos, ypos, x, y);
-    #     }
-    #     xpos = x;
-    #     ypos = y;
-    #   }
+    # ```ruby
+    #   class MyWindow < Wx::ScrolledCanvas
+    # 
+    #     def on_event(event)
+    #       Wx::ClientDC.draw_on(self) do |dc|
+    #         do_prepare_dc(dc)
+    #       
+    #         dc.set_pen(Wx::BLACK_PEN)
+    #         pos = event.position
+    #         if xpos > -1 && ypos > -1 && event.dragging
+    #           dc.draw_line(xpos, ypos, pos.x, pos.y)
+    #         end
+    #         xpos = pos.x
+    #         ypos = pos.y
+    #       end
+    #     end
+    # 
+    #   end
     # ```
     # 
     # Notice that the function sets the origin by moving it relatively to the current origin position, so you shouldn't change the origin before calling Wx::Scrolled#do_prepare_dc or, if you do, reset it to (0, 0) later. If you call Wx::Scrolled#do_prepare_dc immediately after device context creation, as in the example above, this problem doesn't arise, of course, so it is customary to do it like this.
@@ -158,7 +173,10 @@ module Wx
     
     # Set the scrollbar visibility.
     # By default the scrollbar in the corresponding direction is only shown if it is needed, i.e. if the virtual size of the scrolled window in this direction is greater than the current physical window size. Using this function the scrollbar visibility can be changed to be:
-    # - {Wx::ScrollbarVisibility::SHOW_SB_ALWAYS}: To always show the scrollbar, even if it is not needed currently ({Wx::ALWAYS_SHOW_SB} style can be used during the window creation to achieve the same effect but it applies in both directions).- {Wx::ScrollbarVisibility::SHOW_SB_NEVER}: To never show the scrollbar at all. In this case the program should presumably provide some other way for the user to scroll the window.- {Wx::ScrollbarVisibility::SHOW_SB_DEFAULT}: To restore the default behaviour described above.
+    # 
+    # - {Wx::ScrollbarVisibility::SHOW_SB_ALWAYS}: To always show the scrollbar, even if it is not needed currently ({Wx::ALWAYS_SHOW_SB} style can be used during the window creation to achieve the same effect but it applies in both directions).
+    # - {Wx::ScrollbarVisibility::SHOW_SB_NEVER}: To never show the scrollbar at all. In this case the program should presumably provide some other way for the user to scroll the window.
+    # - {Wx::ScrollbarVisibility::SHOW_SB_DEFAULT}: To restore the default behaviour described above.
     # 
     # Note that the window must be created before calling this method.
     # @param horz [ScrollbarVisibility]  The desired visibility for the horizontal scrollbar.
@@ -223,8 +241,8 @@ module Wx
     # The first pair of parameters give the number of pixels per 'scroll step', i.e. amount moved when the up or down scroll arrows are pressed. The second pair gives the length of scrollbar in scroll steps, which sets the size of the virtual window.
     # xPos and yPos optionally specify a position to scroll to immediately.
     # For example, the following gives a window horizontal and vertical scrollbars with 20 pixels per scroll step, and a size of 50 steps (1000 pixels) in each direction: 
-    # ```
-    #   window->SetScrollbars(20, 20, 50, 50);
+    # ```ruby
+    #   window.set_scrollbars(20, 20, 50, 50)
     # ```
     # 
     # {Wx::Scrolled} manages the page size itself, using the current client window size as the page size.

data/lib/wx/doc/gen/scrolled_control.rb

@@ -9,7 +9,8 @@ module Wx
   # The {Wx::Scrolled} class manages scrolling for its client area, transforming the coordinates according to the scrollbar positions, and setting the scroll positions, thumb sizes and ranges according to the area in view.
   # There are two commonly used (but not the only possible!) specializations of this class:
   # 
-  # - {Wx::ScrolledWindow}, aka {Wx::Scrolled}<{Wx::Panel}>, is equivalent to {Wx::ScrolledWindow} from earlier versions. Derived from {Wx::Panel}, it shares {Wx::Panel}'s behaviour with regard to TAB traversal and focus handling. Use this if the scrolled window will have child controls.- {Wx::ScrolledCanvas}, aka {Wx::Scrolled}<{Wx::Window}>, derives from {Wx::Window} and so doesn't handle children specially. This is suitable e.g. for implementing scrollable controls such as tree or list controls.
+  # - {Wx::ScrolledWindow}, aka {Wx::Scrolled}<{Wx::Panel}>, is equivalent to {Wx::ScrolledWindow} from earlier versions. Derived from {Wx::Panel}, it shares {Wx::Panel}'s behaviour with regard to TAB traversal and focus handling. Use this if the scrolled window will have child controls.
+  # - {Wx::ScrolledCanvas}, aka {Wx::Scrolled}<{Wx::Window}>, derives from {Wx::Window} and so doesn't handle children specially. This is suitable e.g. for implementing scrollable controls such as tree or list controls.
   # 
   # See Wx::Scrolled#create if you want to use {Wx::Scrolled} with a custom class.
   # 
@@ -28,24 +29,36 @@ module Wx
   # === Styles
   # 
   # This class supports the following styles:
-  #  
+  # 
   # - {Wx::HSCROLL}: If this style is specified and {Wx::VSCROLL} isn't, the window will be scrollable only in horizontal direction (by default, i.e. if neither this style nor {Wx::VSCROLL} is specified, it scrolls in both directions). 
+  # 
   # - {Wx::VSCROLL}: If this style is specified and {Wx::HSCROLL} isn't, the window will be scrollable only in vertical direction (by default, i.e. if neither this style nor {Wx::HSCROLL} is specified, it scrolls in both directions). 
+  # 
   # - {Wx::ALWAYS_SHOW_SB}: Since wxWidgets 2.9.5, specifying this style makes the window always show its scrollbars, even if they are not used. See Wx::Scrolled#show_scrollbars. 
+  # 
   # - {Wx::RETAINED}: Uses a backing pixmap to speed refreshes. Motif only. 
   # 
   # === Events emitted by this class
   # 
   # The following event-handler methods redirect the events to member method or handler blocks for {Wx::ScrollWinEvent} events.
   # Event handler methods for events emitted by this class:
+  # 
   # - {Wx::EvtHandler#evt_scrollwin}(meth = nil, &block): Process all scroll events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_top}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_TOP} scroll-to-top events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_bottom}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_BOTTOM} scroll-to-bottom events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_lineup}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_LINEUP} line up events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_linedown}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_LINEDOWN} line down events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_pageup}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_PAGEUP} page up events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_pagedown}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_PAGEDOWN} page down events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_thumbtrack}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_THUMBTRACK} thumbtrack events (frequent events sent as the user drags the thumbtrack). 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_thumbrelease}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_THUMBRELEASE} thumb release events. 
   # 
   # Don't confuse {Wx::ScrollWinEvents} generated by this class with {Wx::ScrollEvent} objects generated by {Wx::ScrollBar} and {Wx::Slider}.
@@ -68,7 +81,7 @@ module Wx
   
     # @overload initialize()
     #   Default constructor.
-    #   @return [Scrolled]
+    #   @return [Wx::Scrolled]
     # @overload initialize(parent, id=-1, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=(Wx::HSCROLL|Wx::VSCROLL), name=("scrolledWindow"))
     #   Constructor.
     #   The window is initially created without visible scrollbars. Call Wx::Scrolled#set_scrollbars to specify how big the virtual window size should be.
@@ -78,7 +91,7 @@ module Wx
     #   @param size [Array(Integer, Integer), Wx::Size]  Window size. If a size of {Wx::DEFAULT_SIZE} is specified then the window is sized appropriately.
     #   @param style [Integer]  Window style. See {Wx::Scrolled}.
     #   @param name [String]  Window name.
-    #   @return [Scrolled]
+    #   @return [Wx::Scrolled]
     def initialize(*args) end
     
     # @overload calc_scrolled_position(x, y)
@@ -125,22 +138,24 @@ module Wx
     # Call this function to prepare the device context for drawing a scrolled image.
     # It sets the device origin according to the current scroll position. Wx::Scrolled#do_prepare_dc is called automatically within the default {Wx::EVT_PAINT} event handler, so your Wx::Scrolled#on_draw override will be passed an already 'pre-scrolled' device context. However, if you wish to draw from outside of Wx::Scrolled#on_draw (e.g. from your own {Wx::EVT_PAINT} handler), you must call this function yourself.
     # For example: 
-    # ```
-    #   void MyWindow::OnEvent(wxMouseEvent& event)
-    #   {
-    #     wxClientDC dc(this);
-    #     DoPrepareDC(dc);
-    #   
-    #     dc.SetPen(*wxBLACK_PEN);
-    #     float x, y;
-    #     event.Position(&x, &y);
-    #     if (xpos > -1 && ypos > -1 && event.Dragging())
-    #     {
-    #       dc.DrawLine(xpos, ypos, x, y);
-    #     }
-    #     xpos = x;
-    #     ypos = y;
-    #   }
+    # ```ruby
+    #   class MyWindow < Wx::ScrolledControl
+    # 
+    #     def on_event(event)
+    #       Wx::ClientDC.draw_on(self) do |dc|
+    #         do_prepare_dc(dc)
+    #       
+    #         dc.set_pen(Wx::BLACK_PEN)
+    #         pos = event.position
+    #         if xpos > -1 && ypos > -1 && event.dragging
+    #           dc.draw_line(xpos, ypos, pos.x, pos.y)
+    #         end
+    #         xpos = pos.x
+    #         ypos = pos.y
+    #       end
+    #     end
+    # 
+    #   end
     # ```
     # 
     # Notice that the function sets the origin by moving it relatively to the current origin position, so you shouldn't change the origin before calling Wx::Scrolled#do_prepare_dc or, if you do, reset it to (0, 0) later. If you call Wx::Scrolled#do_prepare_dc immediately after device context creation, as in the example above, this problem doesn't arise, of course, so it is customary to do it like this.
@@ -158,7 +173,10 @@ module Wx
     
     # Set the scrollbar visibility.
     # By default the scrollbar in the corresponding direction is only shown if it is needed, i.e. if the virtual size of the scrolled window in this direction is greater than the current physical window size. Using this function the scrollbar visibility can be changed to be:
-    # - {Wx::ScrollbarVisibility::SHOW_SB_ALWAYS}: To always show the scrollbar, even if it is not needed currently ({Wx::ALWAYS_SHOW_SB} style can be used during the window creation to achieve the same effect but it applies in both directions).- {Wx::ScrollbarVisibility::SHOW_SB_NEVER}: To never show the scrollbar at all. In this case the program should presumably provide some other way for the user to scroll the window.- {Wx::ScrollbarVisibility::SHOW_SB_DEFAULT}: To restore the default behaviour described above.
+    # 
+    # - {Wx::ScrollbarVisibility::SHOW_SB_ALWAYS}: To always show the scrollbar, even if it is not needed currently ({Wx::ALWAYS_SHOW_SB} style can be used during the window creation to achieve the same effect but it applies in both directions).
+    # - {Wx::ScrollbarVisibility::SHOW_SB_NEVER}: To never show the scrollbar at all. In this case the program should presumably provide some other way for the user to scroll the window.
+    # - {Wx::ScrollbarVisibility::SHOW_SB_DEFAULT}: To restore the default behaviour described above.
     # 
     # Note that the window must be created before calling this method.
     # @param horz [ScrollbarVisibility]  The desired visibility for the horizontal scrollbar.
@@ -223,8 +241,8 @@ module Wx
     # The first pair of parameters give the number of pixels per 'scroll step', i.e. amount moved when the up or down scroll arrows are pressed. The second pair gives the length of scrollbar in scroll steps, which sets the size of the virtual window.
     # xPos and yPos optionally specify a position to scroll to immediately.
     # For example, the following gives a window horizontal and vertical scrollbars with 20 pixels per scroll step, and a size of 50 steps (1000 pixels) in each direction: 
-    # ```
-    #   window->SetScrollbars(20, 20, 50, 50);
+    # ```ruby
+    #   window.set_scrollbars(20, 20, 50, 50)
     # ```
     # 
     # {Wx::Scrolled} manages the page size itself, using the current client window size as the page size.

data/lib/wx/doc/gen/scrolled_window.rb

@@ -29,7 +29,8 @@ module Wx
   # The {Wx::Scrolled} class manages scrolling for its client area, transforming the coordinates according to the scrollbar positions, and setting the scroll positions, thumb sizes and ranges according to the area in view.
   # There are two commonly used (but not the only possible!) specializations of this class:
   # 
-  # - {Wx::ScrolledWindow}, aka {Wx::Scrolled}<{Wx::Panel}>, is equivalent to {Wx::ScrolledWindow} from earlier versions. Derived from {Wx::Panel}, it shares {Wx::Panel}'s behaviour with regard to TAB traversal and focus handling. Use this if the scrolled window will have child controls.- {Wx::ScrolledCanvas}, aka {Wx::Scrolled}<{Wx::Window}>, derives from {Wx::Window} and so doesn't handle children specially. This is suitable e.g. for implementing scrollable controls such as tree or list controls.
+  # - {Wx::ScrolledWindow}, aka {Wx::Scrolled}<{Wx::Panel}>, is equivalent to {Wx::ScrolledWindow} from earlier versions. Derived from {Wx::Panel}, it shares {Wx::Panel}'s behaviour with regard to TAB traversal and focus handling. Use this if the scrolled window will have child controls.
+  # - {Wx::ScrolledCanvas}, aka {Wx::Scrolled}<{Wx::Window}>, derives from {Wx::Window} and so doesn't handle children specially. This is suitable e.g. for implementing scrollable controls such as tree or list controls.
   # 
   # See Wx::Scrolled#create if you want to use {Wx::Scrolled} with a custom class.
   # 
@@ -48,24 +49,36 @@ module Wx
   # === Styles
   # 
   # This class supports the following styles:
-  #  
+  # 
   # - {Wx::HSCROLL}: If this style is specified and {Wx::VSCROLL} isn't, the window will be scrollable only in horizontal direction (by default, i.e. if neither this style nor {Wx::VSCROLL} is specified, it scrolls in both directions). 
+  # 
   # - {Wx::VSCROLL}: If this style is specified and {Wx::HSCROLL} isn't, the window will be scrollable only in vertical direction (by default, i.e. if neither this style nor {Wx::HSCROLL} is specified, it scrolls in both directions). 
+  # 
   # - {Wx::ALWAYS_SHOW_SB}: Since wxWidgets 2.9.5, specifying this style makes the window always show its scrollbars, even if they are not used. See Wx::Scrolled#show_scrollbars. 
+  # 
   # - {Wx::RETAINED}: Uses a backing pixmap to speed refreshes. Motif only. 
   # 
   # === Events emitted by this class
   # 
   # The following event-handler methods redirect the events to member method or handler blocks for {Wx::ScrollWinEvent} events.
   # Event handler methods for events emitted by this class:
+  # 
   # - {Wx::EvtHandler#evt_scrollwin}(meth = nil, &block): Process all scroll events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_top}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_TOP} scroll-to-top events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_bottom}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_BOTTOM} scroll-to-bottom events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_lineup}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_LINEUP} line up events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_linedown}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_LINEDOWN} line down events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_pageup}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_PAGEUP} page up events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_pagedown}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_PAGEDOWN} page down events. 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_thumbtrack}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_THUMBTRACK} thumbtrack events (frequent events sent as the user drags the thumbtrack). 
+  # 
   # - {Wx::EvtHandler#evt_scrollwin_thumbrelease}(meth = nil, &block): Process {Wx::EVT_SCROLLWIN_THUMBRELEASE} thumb release events. 
   # 
   # Don't confuse {Wx::ScrollWinEvents} generated by this class with {Wx::ScrollEvent} objects generated by {Wx::ScrollBar} and {Wx::Slider}.
@@ -88,7 +101,7 @@ module Wx
   
     # @overload initialize()
     #   Default constructor.
-    #   @return [Scrolled]
+    #   @return [Wx::Scrolled]
     # @overload initialize(parent, id=-1, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=(Wx::HSCROLL|Wx::VSCROLL), name=("scrolledWindow"))
     #   Constructor.
     #   The window is initially created without visible scrollbars. Call Wx::Scrolled#set_scrollbars to specify how big the virtual window size should be.
@@ -98,7 +111,7 @@ module Wx
     #   @param size [Array(Integer, Integer), Wx::Size]  Window size. If a size of {Wx::DEFAULT_SIZE} is specified then the window is sized appropriately.
     #   @param style [Integer]  Window style. See {Wx::Scrolled}.
     #   @param name [String]  Window name.
-    #   @return [Scrolled]
+    #   @return [Wx::Scrolled]
     def initialize(*args) end
     
     # @overload calc_scrolled_position(x, y)
@@ -145,22 +158,24 @@ module Wx
     # Call this function to prepare the device context for drawing a scrolled image.
     # It sets the device origin according to the current scroll position. Wx::Scrolled#do_prepare_dc is called automatically within the default {Wx::EVT_PAINT} event handler, so your Wx::Scrolled#on_draw override will be passed an already 'pre-scrolled' device context. However, if you wish to draw from outside of Wx::Scrolled#on_draw (e.g. from your own {Wx::EVT_PAINT} handler), you must call this function yourself.
     # For example: 
-    # ```
-    #   void MyWindow::OnEvent(wxMouseEvent& event)
-    #   {
-    #     wxClientDC dc(this);
-    #     DoPrepareDC(dc);
-    #   
-    #     dc.SetPen(*wxBLACK_PEN);
-    #     float x, y;
-    #     event.Position(&x, &y);
-    #     if (xpos > -1 && ypos > -1 && event.Dragging())
-    #     {
-    #       dc.DrawLine(xpos, ypos, x, y);
-    #     }
-    #     xpos = x;
-    #     ypos = y;
-    #   }
+    # ```ruby
+    #   class MyWindow < Wx::ScrolledWindow
+    # 
+    #     def on_event(event)
+    #       Wx::ClientDC.draw_on(self) do |dc|
+    #         do_prepare_dc(dc)
+    #       
+    #         dc.set_pen(Wx::BLACK_PEN)
+    #         pos = event.position
+    #         if xpos > -1 && ypos > -1 && event.dragging
+    #           dc.draw_line(xpos, ypos, pos.x, pos.y)
+    #         end
+    #         xpos = pos.x
+    #         ypos = pos.y
+    #       end
+    #     end
+    # 
+    #   end
     # ```
     # 
     # Notice that the function sets the origin by moving it relatively to the current origin position, so you shouldn't change the origin before calling Wx::Scrolled#do_prepare_dc or, if you do, reset it to (0, 0) later. If you call Wx::Scrolled#do_prepare_dc immediately after device context creation, as in the example above, this problem doesn't arise, of course, so it is customary to do it like this.
@@ -178,7 +193,10 @@ module Wx
     
     # Set the scrollbar visibility.
     # By default the scrollbar in the corresponding direction is only shown if it is needed, i.e. if the virtual size of the scrolled window in this direction is greater than the current physical window size. Using this function the scrollbar visibility can be changed to be:
-    # - {Wx::ScrollbarVisibility::SHOW_SB_ALWAYS}: To always show the scrollbar, even if it is not needed currently ({Wx::ALWAYS_SHOW_SB} style can be used during the window creation to achieve the same effect but it applies in both directions).- {Wx::ScrollbarVisibility::SHOW_SB_NEVER}: To never show the scrollbar at all. In this case the program should presumably provide some other way for the user to scroll the window.- {Wx::ScrollbarVisibility::SHOW_SB_DEFAULT}: To restore the default behaviour described above.
+    # 
+    # - {Wx::ScrollbarVisibility::SHOW_SB_ALWAYS}: To always show the scrollbar, even if it is not needed currently ({Wx::ALWAYS_SHOW_SB} style can be used during the window creation to achieve the same effect but it applies in both directions).
+    # - {Wx::ScrollbarVisibility::SHOW_SB_NEVER}: To never show the scrollbar at all. In this case the program should presumably provide some other way for the user to scroll the window.
+    # - {Wx::ScrollbarVisibility::SHOW_SB_DEFAULT}: To restore the default behaviour described above.
     # 
     # Note that the window must be created before calling this method.
     # @param horz [ScrollbarVisibility]  The desired visibility for the horizontal scrollbar.
@@ -243,8 +261,8 @@ module Wx
     # The first pair of parameters give the number of pixels per 'scroll step', i.e. amount moved when the up or down scroll arrows are pressed. The second pair gives the length of scrollbar in scroll steps, which sets the size of the virtual window.
     # xPos and yPos optionally specify a position to scroll to immediately.
     # For example, the following gives a window horizontal and vertical scrollbars with 20 pixels per scroll step, and a size of 50 steps (1000 pixels) in each direction: 
-    # ```
-    #   window->SetScrollbars(20, 20, 50, 50);
+    # ```ruby
+    #   window.set_scrollbars(20, 20, 50, 50)
     # ```
     # 
     # {Wx::Scrolled} manages the page size itself, using the current client window size as the page size.

data/lib/wx/doc/gen/search_ctrl.rb

@@ -20,26 +20,33 @@ module Wx
   # === Styles
   # 
   # This class supports the following styles:
-  #  
+  # 
   # - {Wx::TE_PROCESS_TAB}: The control will receive {Wx::EVT_CHAR} events for TAB pressed - normally, TAB is used for passing to the next control in a dialog instead. For the control created with this style, you can still use Ctrl-Enter to pass to the next control from the keyboard. 
+  # 
   # - {Wx::TE_NOHIDESEL}: By default, the Windows text control doesn't show the selection when it doesn't have focus - use this style to force it to always show it. It doesn't do anything under other platforms. 
+  # 
   # - {Wx::TE_LEFT}: The text in the control will be left-justified (default). 
-  # - {Wx::TE_CENTRE}: The text in the control will be centered (currently {Wx::MSW} and {Wx::GTK2} only). 
-  # - {Wx::TE_RIGHT}: The text in the control will be right-justified (currently {Wx::MSW} and {Wx::GTK2} only). 
+  # 
+  # - {Wx::TE_CENTRE}: The text in the control will be centered (currently wxMSW and wxGTK2 only). 
+  # 
+  # - {Wx::TE_RIGHT}: The text in the control will be right-justified (currently wxMSW and wxGTK2 only). 
+  # 
   # - {Wx::TE_CAPITALIZE}: On PocketPC and Smartphone, causes the first letter to be capitalized. 
   # 
   # === Events emitted by this class
   # 
   # The following event-handler methods redirect the events to member method or handler blocks for {Wx::CommandEvent} events.
   # Event handler methods for events emitted by this class:{Wx::TextCtrl}. However it is recommended to use {Wx::EVT_SEARCH} to actually start searching to avoid doing it too soon, while the user is still typing (note that {Wx::EVT_SEARCH} is also triggered by pressing Enter in the control). 
+  # 
   # - {Wx::EvtHandler#evt_search}(id, meth = nil, &block): Respond to a {Wx::EVT_SEARCH} event, generated when the search button is clicked. Note that this does not initiate a search on its own, you need to perform the appropriate action in your event handler. You may use 
+  # 
   # - {Wx::EvtHandler#evt_search_cancel}(id, meth = nil, &block): Respond to a {Wx::EVT_SEARCH_CANCEL} event, generated when the cancel button is clicked. 
   # 
   # === 
   # 
-  # Category:  {Wx::Controls}  <div class='appearance'><span class='appearance'>Appearance:</span><table><tr><td> {Wx::MSW} Appearance
-  #   </td><td> {Wx::GTK} Appearance
-  #   </td><td> {Wx::OSX} Appearance
+  # Category:  {Wx::Controls}  <div class='appearance'><span class='appearance'>Appearance:</span><table><tr><td> wxMSW Appearance
+  #   </td><td> wxGTK Appearance
+  #   </td><td> wxOSX Appearance
   #   </td></tr></table></div>
   # @see Wx::TextCtrl 
   # 
@@ -50,7 +57,7 @@ module Wx
   
     # @overload initialize()
     #   Default constructor.
-    #   @return [SearchCtrl]
+    #   @return [Wx::SearchCtrl]
     # @overload initialize(parent, id, value=(''), pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=0, validator=Wx::DEFAULT_VALIDATOR, name=Wx::SearchCtrlNameStr)
     #   Constructor, creating and showing a text control.
     #   
@@ -64,7 +71,7 @@ module Wx
     #   @param style [Integer]  Window style. See {Wx::SearchCtrl}.
     #   @param validator [Wx::Validator]  Window validator.
     #   @param name [String]  Window name.
-    #   @return [SearchCtrl]
+    #   @return [Wx::SearchCtrl]
     def initialize(*args) end
     
     # @param parent [Wx::Window] 

data/lib/wx/doc/gen/simplebook.rb

@@ -25,7 +25,7 @@ module Wx
     # @overload initialize()
     #   Default constructor.
     #   Use {Wx::Simplebook#create} later to really create the control.
-    #   @return [Simplebook]
+    #   @return [Wx::Simplebook]
     # @overload initialize(parent, id=Wx::StandardID::ID_ANY, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=0, name=(''))
     #   Constructs a simple book control.
     #   @param parent [Wx::Window] 
@@ -34,7 +34,7 @@ module Wx
     #   @param size [Array(Integer, Integer), Wx::Size] 
     #   @param style [Integer] 
     #   @param name [String] 
-    #   @return [Simplebook]
+    #   @return [Wx::Simplebook]
     def initialize(*args) end
     
     # Really create the window of an object created using default constructor.

data/lib/wx/doc/gen/single_choice_dialog.rb

@@ -20,9 +20,11 @@ module Wx
   # === Styles
   # 
   # This class supports the following styles:
-  #  
+  # 
   # - {Wx::OK}: Show an OK button. 
+  # 
   # - {Wx::CANCEL}: Show a Cancel button. 
+  # 
   # - {Wx::GeometryCentre::CENTRE}: Centre the message. 
   # 
   # === 
@@ -43,7 +45,7 @@ module Wx
     # @param clientData [void]  An array of client data to be associated with the items. See {Wx::SingleChoiceDialog#get_selection_data}.
     # @param style [Integer]  A dialog style (bitlist) containing flags chosen from standard dialog styles and the ones listed in the class documentation. The default value is equivalent to {Wx::DEFAULT_DIALOG_STYLE} | {Wx::RESIZE_BORDER} | {Wx::OK} | {Wx::CANCEL} | {Wx::GeometryCentre::CENTRE}.
     # @param pos [Array(Integer, Integer), Wx::Point]  Dialog position.
-    # @return [SingleChoiceDialog]
+    # @return [Wx::SingleChoiceDialog]
     def initialize(parent, message, caption, choices, clientData=nil, style=Wx::CHOICEDLG_STYLE, pos=Wx::DEFAULT_POSITION) end
     
     # Returns the index of selected item.