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

data/lib/wx/doc/gen/rtc/symbol_picker_dialog.rb

@@ -13,40 +13,37 @@ module Wx::RTC
   # When the dialog is dismissed, the application can get the selected symbol with {Wx::RTC::SymbolPickerDialog#get_symbol} and test whether a font was specified with {Wx::RTC::SymbolPickerDialog#use_normal_font},fetching the specified font with {Wx::RTC::SymbolPickerDialog#get_font_name}.
   # Here's a realistic example, inserting the supplied symbol into a rich text control in either the current font or specified font.
   # 
-  # ```
-  #   wxRichTextCtrl* ctrl = (wxRichTextCtrl*) FindWindow(ID_RICHTEXT_CTRL);
-  #   
-  #   wxTextAttr attr;
-  #   attr.SetFlags(wxTEXT_ATTR_FONT);
-  #   ctrl-GetStyle(ctrl->GetInsertionPoint(), attr);
-  #   
-  #   wxString currentFontName;
-  #   if (attr.HasFont() && attr.GetFont().IsOk())
-  #       currentFontName = attr.GetFont().GetFaceName();
+  # ```ruby
+  #   ctrl = find_window(ID_RICHTEXT_CTRL)
   #   
-  #   // Don't set the initial font in the dialog (so the user is choosing
-  #   // 'normal text', i.e. the current font) but do tell the dialog
-  #   // what 'normal text' is.
+  #   attr = Wx::TextAttr.new
+  #   attr.set_flags(Wx::TEXT_ATTR_FONT)
+  #   ctrl.get_style(ctrl.insertion_point, attr)
   #   
-  #   wxSymbolPickerDialog dlg("*", wxEmptyString, currentFontName, this);
+  #   if attr.has_font? && attr.font.ok?
+  #     currentFontName = attr.font.face_name
   #   
-  #   if (dlg.ShowModal() == wxID_OK)
-  #   {
-  #       if (dlg.HasSelection())
-  #       {
-  #           long insertionPoint = ctrl-GetInsertionPoint();
+  #   # Don't set the initial font in the dialog (so the user is choosing
+  #   # 'normal text', i.e. the current font) but do tell the dialog
+  #   # what 'normal text' is.
   #   
-  #           ctrl->WriteText(dlg.GetSymbol());
+  #   Wx.SymbolPickerDialog("*", '', currentFontName, self) do |dlg|
   #   
-  #           if (!dlg.UseNormalFont())
-  #           {
-  #               wxFont font(attr.GetFont());
-  #               font.SetFaceName(dlg.GetFontName());
-  #               attr.SetFont(font);
-  #               ctrl-SetStyle(insertionPoint, insertionPoint+1, attr);
-  #           }
-  #       }
-  #   }
+  #     if dlg.show_modal == Wx::ID_OK
+  #       if dlg.has_selection?
+  #         insertionPoint = ctrl.insertion_point
+  # 
+  #         ctrl.write_text(dlg.symbol)
+  # 
+  #         unless dlg.use_normal_font
+  #           font = attr.font
+  #           font.face_name = dlg.font_name
+  #           attr.font = font
+  #           ctrl.set_style(insertionPoint, insertionPoint+1, attr)
+  #         end
+  #       end
+  #     end
+  #   end
   # ```
   # 
   # === 
@@ -57,7 +54,7 @@ module Wx::RTC
   
     # @overload initialize()
     #   Default ctor.
-    #   @return [SymbolPickerDialog]
+    #   @return [Wx::RTC::SymbolPickerDialog]
     # @overload initialize(symbol, initialFont, normalTextFont, parent, id=Wx::StandardID::ID_ANY, title=(_.new("Symbols")), pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=(Wx::DEFAULT_DIALOG_STYLE|Wx::RESIZE_BORDER|Wx::CLOSE_BOX))
     #   Constructor.
     #   @param symbol [String]  The initial symbol to show. Specify a single character in a string, or an empty string.
@@ -69,7 +66,7 @@ module Wx::RTC
     #   @param pos [Array(Integer, Integer), Wx::Point]  The dialog's position.
     #   @param size [Array(Integer, Integer), Wx::Size]  The dialog's size.
     #   @param style [Integer]  The dialog's window style.
-    #   @return [SymbolPickerDialog]
+    #   @return [Wx::RTC::SymbolPickerDialog]
     def initialize(*args) end
     
     # Creation: see the constructor for details about the parameters.
@@ -82,7 +79,7 @@ module Wx::RTC
     # @param pos [Array(Integer, Integer), Wx::Point] 
     # @param size [Array(Integer, Integer), Wx::Size] 
     # @param style [Integer] 
-    # @return [true,false]
+    # @return [Boolean]
     def create(symbol, initialFont, normalTextFont, parent, id=Wx::StandardID::ID_ANY, caption=(Wx::GetTranslation.new("Symbols")), pos=Wx::DEFAULT_POSITION, size=(Wx::Size.new(400, 300)), style=(Wx::DEFAULT_DIALOG_STYLE|Wx::RESIZE_BORDER|Wx::CLOSE_BOX)) end
     
     # Returns the font name (the font reflected in the font list).
@@ -91,7 +88,7 @@ module Wx::RTC
     alias_method :font_name, :get_font_name
     
     # Returns true if the dialog is showing the full range of Unicode characters.
-    # @return [true,false]
+    # @return [Boolean]
     def get_from_unicode; end
     alias_method :from_unicode, :get_from_unicode
     
@@ -111,7 +108,7 @@ module Wx::RTC
     alias_method :symbol_char, :get_symbol_char
     
     # Returns true if a symbol is selected.
-    # @return [true,false]
+    # @return [Boolean]
     def has_selection; end
     alias_method :has_selection?, :has_selection
     
@@ -122,7 +119,7 @@ module Wx::RTC
     alias_method :font_name=, :set_font_name
     
     # Sets the internal flag indicating that the full Unicode range should be displayed.
-    # @param value [true,false] 
+    # @param value [Boolean] 
     # @return [void]
     def set_from_unicode(value) end
     alias_method :from_unicode=, :set_from_unicode
@@ -140,13 +137,13 @@ module Wx::RTC
     alias_method :symbol=, :set_symbol
     
     # Sets Unicode display mode.
-    # @param unicodeMode [true,false] 
+    # @param unicodeMode [Boolean] 
     # @return [void]
     def set_unicode_mode(unicodeMode) end
     alias_method :unicode_mode=, :set_unicode_mode
     
     # Returns true if the has specified normal text - that is, there is no selected font.
-    # @return [true,false]
+    # @return [Boolean]
     def use_normal_font; end
     
   end # SymbolPickerDialog

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

@@ -76,7 +76,9 @@ module Wx
   # 
   # The following event-handler methods redirect the events to member method or handler blocks for {Wx::SashEvent} events.
   # Event handler methods:
+  # 
   # - {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. 
   # 
   # === 
@@ -90,8 +92,8 @@ module Wx
   
     # Constructor.
     # @param id [Integer] 
-    # @param edge [SashEdgePosition] 
-    # @return [SashEvent]
+    # @param edge [Wx::SashEdgePosition] 
+    # @return [Wx::SashEvent]
     def initialize(id=0, edge=Wx::SashEdgePosition::SASH_NONE) end
     
     # Returns the rectangle representing the new size the window would be if the resize was applied.
@@ -102,17 +104,17 @@ module Wx
     
     # Returns the status of the sash: one of {Wx::SashDragStatus::SASH_STATUS_OK}, {Wx::SashDragStatus::SASH_STATUS_OUT_OF_RANGE}.
     # If the drag caused the notional bounding box of the window to flip over, for example, the drag will be out of rage.
-    # @return [SashDragStatus]
+    # @return [Wx::SashDragStatus]
     def get_drag_status; end
     alias_method :drag_status, :get_drag_status
     
     # Returns the dragged edge.
     # The return value is one of {Wx::SashEdgePosition::SASH_TOP}, {Wx::SashEdgePosition::SASH_RIGHT}, {Wx::SashEdgePosition::SASH_BOTTOM}, {Wx::SashEdgePosition::SASH_LEFT}.
-    # @return [SashEdgePosition]
+    # @return [Wx::SashEdgePosition]
     def get_edge; end
     alias_method :edge, :get_edge
     
-    # @param edge [SashEdgePosition] 
+    # @param edge [Wx::SashEdgePosition] 
     # @return [void]
     def set_edge(edge) end
     alias_method :edge=, :set_edge
@@ -122,7 +124,7 @@ module Wx
     def set_drag_rect(rect) end
     alias_method :drag_rect=, :set_drag_rect
     
-    # @param status [SashDragStatus] 
+    # @param status [Wx::SashDragStatus] 
     # @return [void]
     def set_drag_status(status) end
     alias_method :drag_status=, :set_drag_status

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

@@ -76,7 +76,7 @@ module Wx
   
     # @overload initialize()
     #   Default ctor.
-    #   @return [SashLayoutWindow]
+    #   @return [Wx::SashLayoutWindow]
     # @overload initialize(parent, id, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=(Wx::CLIP_CHILDREN|wxSW_3D), name=("layoutWindow"))
     #   Constructs a sash layout 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.
@@ -85,7 +85,7 @@ module Wx
     #   @param size [Array(Integer, Integer), Wx::Size]  Window size. {Wx::DEFAULT_SIZE} is (-1, -1) which indicates that {Wx::SashLayoutWindows} should generate a default size for the window.
     #   @param style [Integer]  Window style. For window styles, please see {Wx::SashLayoutWindow}.
     #   @param name [String]  Window name.
-    #   @return [SashLayoutWindow]
+    #   @return [Wx::SashLayoutWindow]
     def initialize(*args) end
     
     # Initializes a sash layout window, which can be a child of a frame, dialog or any other non-control window.
@@ -95,16 +95,16 @@ module Wx
     # @param size [Array(Integer, Integer), Wx::Size]  Window size. {Wx::DEFAULT_SIZE} is (-1, -1) which indicates that {Wx::SashLayoutWindows} should generate a default size for the window.
     # @param style [Integer]  Window style. For window styles, please see {Wx::SashLayoutWindow}.
     # @param name [String]  Window name.
-    # @return [true,false]
+    # @return [Boolean]
     def create(parent, id=Wx::StandardID::ID_ANY, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=(Wx::CLIP_CHILDREN|wxSW_3D), name=("layoutWindow")) end
     
     # Returns the alignment of the window: one of {Wx::LayoutAlignment::LAYOUT_TOP}, {Wx::LayoutAlignment::LAYOUT_LEFT}, {Wx::LayoutAlignment::LAYOUT_RIGHT}, {Wx::LayoutAlignment::LAYOUT_BOTTOM}.
-    # @return [LayoutAlignment]
+    # @return [Wx::LayoutAlignment]
     def get_alignment; end
     alias_method :alignment, :get_alignment
     
     # Returns the orientation of the window: one of {Wx::LayoutOrientation::LAYOUT_HORIZONTAL}, {Wx::LayoutOrientation::LAYOUT_VERTICAL}.
-    # @return [LayoutOrientation]
+    # @return [Wx::LayoutOrientation]
     def get_orientation; end
     alias_method :orientation, :get_orientation
     
@@ -123,7 +123,7 @@ module Wx
     
     # Sets the alignment of the window (which edge of the available parent client area the window is attached to).
     # alignment is one of {Wx::LayoutAlignment::LAYOUT_TOP}, {Wx::LayoutAlignment::LAYOUT_LEFT}, {Wx::LayoutAlignment::LAYOUT_RIGHT}, {Wx::LayoutAlignment::LAYOUT_BOTTOM}.
-    # @param alignment [LayoutAlignment] 
+    # @param alignment [Wx::LayoutAlignment] 
     # @return [void]
     def set_alignment(alignment) end
     alias_method :alignment=, :set_alignment
@@ -137,7 +137,7 @@ module Wx
     
     # Sets the orientation of the window (the direction the window will stretch in, to fill the available parent client area).
     # orientation is one of {Wx::LayoutOrientation::LAYOUT_HORIZONTAL}, {Wx::LayoutOrientation::LAYOUT_VERTICAL}.
-    # @param orientation [LayoutOrientation] 
+    # @param orientation [Wx::LayoutOrientation] 
     # @return [void]
     def set_orientation(orientation) end
     alias_method :orientation=, :set_orientation
@@ -158,7 +158,9 @@ module Wx
   # 
   # The following event-handler methods redirect the events to member method or handler blocks for {Wx::CalculateLayoutEvent} events.
   # Event handler methods for events emitted by this class:
+  # 
   # - {Wx::EvtHandler#evt_query_layout_info}(meth = nil, &block): Process a {Wx::EVT_QUERY_LAYOUT_INFO} event, to get size, orientation and alignment from a window. See {Wx::QueryLayoutInfoEvent}. 
+  # 
   # - {Wx::EvtHandler#evt_calculate_layout}(meth = nil, &block): Process a {Wx::EVT_CALCULATE_LAYOUT} event, which asks the window to take a 'bite' out of a rectangle provided by the algorithm. See {Wx::CalculateLayoutEvent}. 
   # 
   # Note that the algorithm object does not respond to events, but itself generates the previous events in order to calculate window sizes.
@@ -173,28 +175,28 @@ module Wx
   class LayoutAlgorithm < Object
   
     # Default constructor.
-    # @return [LayoutAlgorithm]
+    # @return [Wx::LayoutAlgorithm]
     def initialize; end
     
     # Lays out the children of a normal frame.
     # mainWindow is set to occupy the remaining space. This function simply calls {Wx::LayoutAlgorithm#layout_window}.
     # @param frame [Wx::Frame] 
     # @param mainWindow [Wx::Window] 
-    # @return [true,false]
+    # @return [Boolean]
     def layout_frame(frame, mainWindow=nil) end
     
     # Lays out the children of an MDI parent frame.
     # If rect is non-NULL, the given rectangle will be used as a starting point instead of the frame's client area. The MDI client window is set to occupy the remaining space.
     # @param frame [Wx::MDIParentFrame] 
     # @param rect [Wx::Rect] 
-    # @return [true,false]
+    # @return [Boolean]
     def layout_mdi_frame(frame, rect=nil) end
     
     # Lays out the children of a normal frame or other window.
     # mainWindow is set to occupy the remaining space. If this is not specified, then the last window that responds to a calculate layout event in query mode will get the remaining space (that is, a non-query OnCalculateLayout event will not be sent to this window and the window will be set to the remaining size).
     # @param parent [Wx::Window] 
     # @param mainWindow [Wx::Window] 
-    # @return [true,false]
+    # @return [Boolean]
     def layout_window(parent, mainWindow=nil) end
     
   end # LayoutAlgorithm

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.
@@ -72,8 +77,8 @@ module Wx
     # Returns true if a sash is visible on the given edge, false otherwise.
     # 
     # @see Wx::SashWindow#set_sash_visible 
-    # @param edge [SashEdgePosition]  Edge. One of {Wx::SashEdgePosition::SASH_TOP}, {Wx::SashEdgePosition::SASH_RIGHT}, {Wx::SashEdgePosition::SASH_BOTTOM}, {Wx::SashEdgePosition::SASH_LEFT}.
-    # @return [true,false]
+    # @param edge [Wx::SashEdgePosition]  Edge. One of {Wx::SashEdgePosition::SASH_TOP}, {Wx::SashEdgePosition::SASH_RIGHT}, {Wx::SashEdgePosition::SASH_BOTTOM}, {Wx::SashEdgePosition::SASH_LEFT}.
+    # @return [Boolean]
     def get_sash_visible(edge) end
     alias_method :sash_visible, :get_sash_visible
     
@@ -104,13 +109,13 @@ module Wx
     # Call this function to make a sash visible or invisible on a particular edge.
     # 
     # @see Wx::SashWindow#get_sash_visible 
-    # @param edge [SashEdgePosition]  Edge to change. One of {Wx::SashEdgePosition::SASH_TOP}, {Wx::SashEdgePosition::SASH_RIGHT}, {Wx::SashEdgePosition::SASH_BOTTOM}, {Wx::SashEdgePosition::SASH_LEFT}.
-    # @param visible [true,false]  true to make the sash visible, false to make it invisible.
+    # @param edge [Wx::SashEdgePosition]  Edge to change. One of {Wx::SashEdgePosition::SASH_TOP}, {Wx::SashEdgePosition::SASH_RIGHT}, {Wx::SashEdgePosition::SASH_BOTTOM}, {Wx::SashEdgePosition::SASH_LEFT}.
+    # @param visible [Boolean]  true to make the sash visible, false to make it invisible.
     # @return [void]
     def set_sash_visible(edge, visible) end
     
     # Get border size.
-    # @param edge [SashEdgePosition] 
+    # @param edge [Wx::SashEdgePosition] 
     # @return [Integer]
     def get_edge_margin(edge) end
     alias_method :edge_margin, :get_edge_margin
@@ -141,7 +146,7 @@ module Wx
     # @param x [Integer] 
     # @param y [Integer] 
     # @param tolerance [Integer] 
-    # @return [SashEdgePosition]
+    # @return [Wx::SashEdgePosition]
     def sash_hit_test(x, y, tolerance=2) end
     
     # Resizes subwindows.

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,11 +96,11 @@ 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.
-    # See {Wx::ScrollBar#scroll_bar} for details.
+    # See {Wx::ScrollBar#initialize} for details.
     # @param parent [Wx::Window] 
     # @param id [Integer] 
     # @param pos [Array(Integer, Integer), Wx::Point] 
@@ -87,7 +108,7 @@ module Wx
     # @param style [Integer] 
     # @param validator [Wx::Validator] 
     # @param name [String] 
-    # @return [true,false]
+    # @return [Boolean]
     def create(parent, id, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=Wx::SB_HORIZONTAL, validator=Wx::DEFAULT_VALIDATOR, name=Wx::ScrollBarNameStr) end
     
     # Returns the page size of the scrollbar.
@@ -120,15 +141,15 @@ 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.
     # @param thumbSize [Integer]  The size of the thumb, or visible portion of the scrollbar, in scroll units.
     # @param range [Integer]  The maximum position of the scrollbar.
     # @param pageSize [Integer]  The size of the page size in scroll units. This is the number of units the scrollbar will scroll when it is paged up or down. Often it is the same as the thumb size.
-    # @param refresh [true,false]  true to redraw the scrollbar, false otherwise.
+    # @param refresh [Boolean]  true to redraw the scrollbar, false otherwise.
     # @return [void]
     def set_scrollbar(position, thumbSize, range, pageSize, refresh=true) end
     
@@ -141,7 +162,7 @@ module Wx
     alias_method :thumb_position=, :set_thumb_position
     
     # Returns true for scrollbars that have the vertical style set.
-    # @return [true,false]
+    # @return [Boolean]
     def is_vertical; end
     alias_method :vertical?, :is_vertical