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

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

@@ -95,50 +95,67 @@ module Wx
   # There are several different types of tools you can add to a toolbar. These types are controlled by the {Wx::ItemKind} enumeration.
   # Note that many methods in {Wx::ToolBar} such as {Wx::ToolBar#add_tool} return a <code>wxToolBarToolBase*</code> object. This should be regarded as an opaque handle representing the newly added toolbar item, providing access to its id and position within the toolbar. Changes to the item's state should be made through calls to {Wx::ToolBar} methods, for example {Wx::ToolBar#enable_tool}. Calls to {Wx::ToolBarToolBase} methods (undocumented by purpose) will not change the visible state of the item within the tool bar.
   # After you have added all the tools you need, you must call {Wx::ToolBar#realize} to effectively construct and display the toolbar.
-  # <b>{Wx::MSW} note</b>: Note that under {Wx::MSW} toolbar paints tools to reflect system-wide colours. If you use more than 16 colours in your tool bitmaps, you may wish to suppress this behaviour, otherwise system colours in your bitmaps will inadvertently be mapped to system colours. To do this, set the msw.remap system option before creating the toolbar: 
-  # ```
-  #   wxSystemOptions::SetOption("msw.remap", 0);
+  # <b>wxMSW note</b>: Note that under wxMSW toolbar paints tools to reflect system-wide colours. If you use more than 16 colours in your tool bitmaps, you may wish to suppress this behaviour, otherwise system colours in your bitmaps will inadvertently be mapped to system colours. To do this, set the msw.remap system option before creating the toolbar: 
+  # ```ruby
+  #   Wx::SystemOptions.set_option('msw.remap', 0)
   # ```
   #  If you wish to use 32-bit images (which include an alpha channel for transparency) use: 
+  # ```ruby
+  #   Wx::SystemOptions.set_option('msw.remap', 2)
   # ```
-  #   wxSystemOptions::SetOption("msw.remap", 2);
-  # ```
-  #  Then colour remapping is switched off, and a transparent background used. But only use this option under Windows XP with true colour: 
-  # ```
-  #   if (wxTheApp->GetComCtl32Version() >= 600 && ::wxDisplayDepth() >= 32)
-  # ```
-  # 
+  #  Then colour remapping is switched off, and a transparent background used.  
   # === Styles
   # 
   # This class supports the following styles:
-  #  
+  # 
   # - {Wx::TB_FLAT}: Gives the toolbar a flat look (Windows and GTK only). 
+  # 
   # - {Wx::TB_DOCKABLE}: Makes the toolbar floatable and dockable (GTK only). 
+  # 
   # - {Wx::TB_HORIZONTAL}: Specifies horizontal layout (default). 
+  # 
   # - {Wx::TB_VERTICAL}: Specifies vertical layout. 
+  # 
   # - {Wx::TB_TEXT}: Shows the text in the toolbar buttons; by default only icons are shown. 
+  # 
   # - {Wx::TB_NOICONS}: Specifies no icons in the toolbar buttons; by default they are shown. 
+  # 
   # - {Wx::TB_NODIVIDER}: Specifies no divider (border) above the toolbar (Windows only) 
+  # 
   # - {Wx::TB_NOALIGN}: Specifies no alignment with the parent window (Windows only, not very useful). 
+  # 
   # - {Wx::TB_HORZ_LAYOUT}: Shows the text and the icons alongside, not vertically stacked (Windows and GTK 2 only). This style must be used with {Wx::TB_TEXT}. 
+  # 
   # - {Wx::TB_HORZ_TEXT}: Combination of {Wx::TB_HORZ_LAYOUT} and {Wx::TB_TEXT}. 
+  # 
   # - {Wx::TB_NO_TOOLTIPS}: Don't show the short help tooltips for the tools when the mouse hovers over them. 
+  # 
   # - {Wx::TB_BOTTOM}: Align the toolbar at the bottom of parent window. 
+  # 
   # - {Wx::TB_RIGHT}: Align the toolbar at the right side of parent window. 
+  # 
   # - {Wx::TB_DEFAULT_STYLE}: The {Wx::TB_HORIZONTAL} style. This style is new since wxWidgets 2.9.5. 
   # 
-  # See also Window Styles. Note that the {Wx::MSW} native toolbar ignores {Wx::TB_NOICONS} style. Also, toggling the {Wx::TB_TEXT} works only if the style was initially on.
+  # See also Window Styles. Note that the wxMSW native toolbar ignores {Wx::TB_NOICONS} style. Also, toggling the {Wx::TB_TEXT} works only if the style was initially on.
   # === 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::EvtHandler#evt_tool}(id, meth = nil, &block): Process a {Wx::EVT_TOOL} event (a synonym for {Wx::EVT_MENU}). Pass the id of the tool. 
+  # 
   # - {Wx::EvtHandler#evt_menu}(id, meth = nil, &block): The same as EVT_TOOL(). 
+  # 
   # - {Wx::EvtHandler#evt_tool_range}(id1,  id2, meth = nil, &block): Process a {Wx::EVT_TOOL} event for a range of identifiers. Pass the ids of the tools. 
+  # 
   # - {Wx::EvtHandler#evt_menu_range}(id1,  id2, meth = nil, &block): The same as EVT_TOOL_RANGE(). 
-  # - {Wx::EvtHandler#evt_tool_rclicked}(id, meth = nil, &block): Process a {Wx::EVT_TOOL_RCLICKED} event. Pass the id of the tool. (Not available on {Wx::OSX}.) 
-  # - {Wx::EvtHandler#evt_tool_rclicked_range}(id1,  id2, meth = nil, &block): Process a {Wx::EVT_TOOL_RCLICKED} event for a range of ids. Pass the ids of the tools. (Not available on {Wx::OSX}.) 
-  # - {Wx::EvtHandler#evt_tool_enter}(id, meth = nil, &block): Process a {Wx::EVT_TOOL_ENTER} event. Pass the id of the toolbar itself. The value of {Wx::CommandEvent#get_selection} is the tool id, or -1 if the mouse cursor has moved off a tool. (Not available on {Wx::OSX}.) 
+  # 
+  # - {Wx::EvtHandler#evt_tool_rclicked}(id, meth = nil, &block): Process a {Wx::EVT_TOOL_RCLICKED} event. Pass the id of the tool. (Not available on wxOSX.) 
+  # 
+  # - {Wx::EvtHandler#evt_tool_rclicked_range}(id1,  id2, meth = nil, &block): Process a {Wx::EVT_TOOL_RCLICKED} event for a range of ids. Pass the ids of the tools. (Not available on wxOSX.) 
+  # 
+  # - {Wx::EvtHandler#evt_tool_enter}(id, meth = nil, &block): Process a {Wx::EVT_TOOL_ENTER} event. Pass the id of the toolbar itself. The value of {Wx::CommandEvent#get_selection} is the tool id, or -1 if the mouse cursor has moved off a tool. (Not available on wxOSX.) 
+  # 
   # - {Wx::EvtHandler#evt_tool_dropdown}(id, meth = nil, &block): Process a {Wx::EVT_TOOL_DROPDOWN} event. If unhandled, displays the default dropdown menu set using {Wx::ToolBar#set_dropdown_menu}. 
   # 
   # The toolbar class emits menu commands in the same way that a frame menubar does, so you can use one EVT_MENU() macro for both a menu item and a toolbar button. The event handler functions take a {Wx::CommandEvent} argument. For most event macros, the identifier of the tool is passed, but for EVT_TOOL_ENTER() the toolbar window identifier is passed and the tool identifier is retrieved from the {Wx::CommandEvent}. This is because the identifier may be {Wx::StandardID::ID_ANY} when the mouse moves off a tool, and {Wx::StandardID::ID_ANY} is not allowed as an identifier in the event system.
@@ -166,7 +183,7 @@ module Wx
     #   @param label [String]  The string to be displayed with the tool. This string may include mnemonics, i.e. characters prefixed by an ampersand ("&"), but they are stripped from it and not actually shown in the toolbar as tools can't be activated from keyboard.
     #   @param bitmap [Wx::BitmapBundle,Wx::Bitmap,Wx::Icon,Wx::Image]  The primary tool bitmap.
     #   @param shortHelp [String]  This string is used for the tools tooltip.
-    #   @param kind [ItemKind]  May be {Wx::ItemKind::ITEM_NORMAL} for a normal button (default), {Wx::ItemKind::ITEM_CHECK} for a checkable tool (such tool stays pressed after it had been toggled) or {Wx::ItemKind::ITEM_RADIO} for a checkable tool which makes part of a radio group of tools each of which is automatically unchecked whenever another button in the group is checked. {Wx::ItemKind::ITEM_DROPDOWN} specifies that a drop-down menu button will appear next to the tool button (only GTK+ and MSW). Call {Wx::ToolBar#set_dropdown_menu} afterwards.
+    #   @param kind [Wx::ItemKind]  May be {Wx::ItemKind::ITEM_NORMAL} for a normal button (default), {Wx::ItemKind::ITEM_CHECK} for a checkable tool (such tool stays pressed after it had been toggled) or {Wx::ItemKind::ITEM_RADIO} for a checkable tool which makes part of a radio group of tools each of which is automatically unchecked whenever another button in the group is checked. {Wx::ItemKind::ITEM_DROPDOWN} specifies that a drop-down menu button will appear next to the tool button (only GTK+ and MSW). Call {Wx::ToolBar#set_dropdown_menu} afterwards.
     #   @return [Wx::ToolBarToolBase]
     # @overload add_tool(toolId, label, bitmap, bmpDisabled, kind=Wx::ItemKind::ITEM_NORMAL, shortHelp=(''), longHelp=(''), clientData=nil)
     #   Adds a tool to the toolbar.
@@ -182,7 +199,7 @@ module Wx
     #   @param label [String]  The string to be displayed with the tool.
     #   @param bitmap [Wx::BitmapBundle,Wx::Bitmap,Wx::Icon,Wx::Image]  The primary tool bitmap.
     #   @param bmpDisabled [Wx::BitmapBundle,Wx::Bitmap,Wx::Icon,Wx::Image]  The bitmap used when the tool is disabled. If it is equal to {Wx::NULL_BITMAP} (default), the disabled bitmap is automatically generated by greying the normal one.
-    #   @param kind [ItemKind]  May be {Wx::ItemKind::ITEM_NORMAL} for a normal button (default), {Wx::ItemKind::ITEM_CHECK} for a checkable tool (such tool stays pressed after it had been toggled) or {Wx::ItemKind::ITEM_RADIO} for a checkable tool which makes part of a radio group of tools each of which is automatically unchecked whenever another button in the group is checked. {Wx::ItemKind::ITEM_DROPDOWN} specifies that a drop-down menu button will appear next to the tool button (only GTK+ and MSW). Call {Wx::ToolBar#set_dropdown_menu} afterwards.
+    #   @param kind [Wx::ItemKind]  May be {Wx::ItemKind::ITEM_NORMAL} for a normal button (default), {Wx::ItemKind::ITEM_CHECK} for a checkable tool (such tool stays pressed after it had been toggled) or {Wx::ItemKind::ITEM_RADIO} for a checkable tool which makes part of a radio group of tools each of which is automatically unchecked whenever another button in the group is checked. {Wx::ItemKind::ITEM_DROPDOWN} specifies that a drop-down menu button will appear next to the tool button (only GTK+ and MSW). Call {Wx::ToolBar#set_dropdown_menu} afterwards.
     #   @param shortHelp [String]  This string is used for the tools tooltip.
     #   @param longHelp [String]  This string is shown in the statusbar (if any) of the parent frame when the mouse pointer is inside the tool.
     #   @param clientData [Wx::Object]  An optional pointer to client data which can be retrieved later using {Wx::ToolBar#get_tool_client_data}.
@@ -201,7 +218,7 @@ module Wx
     # @param label [String] 
     # @param bitmap [Wx::BitmapBundle,Wx::Bitmap,Wx::Icon,Wx::Image] 
     # @param bmpDisabled [Wx::BitmapBundle,Wx::Bitmap,Wx::Icon,Wx::Image] 
-    # @param kind [ItemKind] 
+    # @param kind [Wx::ItemKind] 
     # @param shortHelp [String] 
     # @param longHelp [String] 
     # @param clientData [Wx::Object] 
@@ -227,7 +244,7 @@ module Wx
     
     # @overload initialize()
     #   Default constructor.
-    #   @return [ToolBar]
+    #   @return [Wx::ToolBar]
     # @overload initialize(parent, id, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=Wx::TB_HORIZONTAL, name=Wx::ToolBarNameStr)
     #   Constructs a toolbar.
     #   After a toolbar is created, you use {Wx::ToolBar#add_tool} and perhaps {Wx::ToolBar#add_separator}, and then you must call {Wx::ToolBar#realize} to construct and display the toolbar tools.
@@ -237,7 +254,7 @@ module Wx
     #   @param size [Array(Integer, Integer), Wx::Size]  Window size. {Wx::DEFAULT_SIZE} indicates that wxWidgets should generate a default size for the window.
     #   @param style [Integer]  Window style. See {Wx::ToolBar} initial description for details.
     #   @param name [String]  Window name.
-    #   @return [ToolBar]
+    #   @return [Wx::ToolBar]
     def initialize(*args) end
     
     # Adds a new check (or toggle) tool to the toolbar.
@@ -301,12 +318,12 @@ module Wx
     # true if the tool was deleted, false otherwise.
     # @see Wx::ToolBar#delete_tool_by_pos 
     # @param toolId [Integer] 
-    # @return [true,false]
+    # @return [Boolean]
     def delete_tool(toolId) end
     
     # This function behaves like {Wx::ToolBar#delete_tool} but it deletes the tool at the specified position and not the one with the given id.
     # @param pos [Integer] 
-    # @return [true,false]
+    # @return [Boolean]
     def delete_tool_by_pos(pos) end
     
     # Enables or disables the tool.
@@ -314,7 +331,7 @@ module Wx
     # @see Wx::ToolBar#get_tool_enabled
     # @see  Wx::ToolBar#toggle_tool 
     # @param toolId [Integer]  ID of the tool to enable or disable, as passed to {Wx::ToolBar#add_tool}.
-    # @param enable [true,false]  If true, enables the tool, otherwise disables it.
+    # @param enable [Boolean]  If true, enables the tool, otherwise disables it.
     # @return [void]
     def enable_tool(toolId, enable) end
     
@@ -331,7 +348,7 @@ module Wx
     # Finds a tool for the given mouse position.
     # A pointer to a tool if a tool is found, or NULL otherwise.
     # 
-    # Currently not implemented in {Wx::GTK} (always returns NULL there).
+    # Currently not implemented in wxGTK (always returns NULL there).
     # @param x [Integer]  X position.
     # @param y [Integer]  Y position.
     # @return [Wx::ToolBarToolBase]
@@ -354,16 +371,9 @@ module Wx
     def get_tool_bitmap_size; end
     alias_method :tool_bitmap_size, :get_tool_bitmap_size
     
-    # @overload get_tool_by_pos(pos)
-    #   Returns a pointer to the tool at ordinal position pos.
-    #   Don't confuse this with {Wx::ToolBar#find_tool_for_position}.
-    #   @see Wx::ToolBar#get_tools_count 
-    #   @param pos [Integer] 
-    #   @return [Wx::ToolBarToolBase]
-    # @overload get_tool_by_pos(pos)
-    #   @param pos [Integer] 
-    #   @return [Wx::ToolBarToolBase]
-    def get_tool_by_pos(*args) end
+    # @param pos [Integer] 
+    # @return [Wx::ToolBarToolBase]
+    def get_tool_by_pos(pos) end
     alias_method :tool_by_pos, :get_tool_by_pos
     
     # Get any client data associated with the tool.
@@ -377,7 +387,7 @@ module Wx
     # true if the tool is enabled, false otherwise.
     # @see Wx::ToolBar#enable_tool 
     # @param toolId [Integer]  ID of the tool in question, as passed to {Wx::ToolBar#add_tool}.
-    # @return [true,false]
+    # @return [Boolean]
     def get_tool_enabled(toolId) end
     alias_method :tool_enabled, :get_tool_enabled
     
@@ -431,7 +441,7 @@ module Wx
     # true if the tool is toggled on, false otherwise.
     # @see Wx::ToolBar#toggle_tool 
     # @param toolId [Integer]  ID of the tool in question, as passed to {Wx::ToolBar#add_tool}.
-    # @return [true,false]
+    # @return [Boolean]
     def get_tool_state(toolId) end
     alias_method :tool_state, :get_tool_state
     
@@ -473,8 +483,8 @@ module Wx
     # @see Wx::ToolBar#on_mouse_enter
     # @see  Wx::ToolBar#on_right_click 
     # @param toolId [Integer]  The identifier passed to {Wx::ToolBar#add_tool}.
-    # @param toggleDown [true,false]  true if the tool is a toggle and the toggle is down, otherwise is false.
-    # @return [true,false]
+    # @param toggleDown [Boolean]  true if the tool is a toggle and the toggle is down, otherwise is false.
+    # @return [Boolean]
     def on_left_click(toolId, toggleDown) end
     
     # This is called when the mouse cursor moves into a tool or out of the toolbar.
@@ -486,7 +496,7 @@ module Wx
     def on_mouse_enter(toolId) end
     
     # This function should be called after you have added tools.
-    # @return [true,false]
+    # @return [Boolean]
     def realize; end
     
     # Removes the given tool from the toolbar but doesn't delete it.
@@ -502,18 +512,18 @@ module Wx
     # If you define a EVT_TOOL_DROPDOWN() handler in your program, you must call {Wx::Event#skip} from it or the menu won't be displayed.
     # @param id [Integer] 
     # @param menu [Wx::Menu] 
-    # @return [true,false]
+    # @return [Boolean]
     def set_dropdown_menu(id, menu) end
     
     # Sets the default size of each tool bitmap.
     # It is usually unnecessary to call this function, as the tools will always be made big enough to fit the size of the bitmaps used in them. Moreover, calling it forces {Wx::ToolBar} to scale its images in high DPI using the provided size, instead of letting {Wx::BitmapBundle} used for the tool bitmaps determine the best suitable bitmap size, which may result in suboptimal appearance.
     # If you do call it, it must be done before toolbar is {Wx::ToolBar#realize}'d.
     # Example of using this function to force the bitmaps to be at least 32 pixels wide and tall (at normal DPI): 
-    # ```
-    #   toolbar->SetToolBitmapSize(FromDIP(wxSize(32, 32)));
-    #   toolbar->AddTool(wxID_NEW, "New", wxBitmapBundle::FromXXX(...));
+    # ```ruby
+    #   toolbar.set_tool_bitmap_size(from_dip(Wx::Size.new(32, 32)))
+    #   toolbar.add_tool(Wx::ID_NEW, 'New', Wx::BitmapBundle.from_XXX(...))
     #   ...
-    #   toolbar->Realize();
+    #   toolbar.realize
     # ```
     # @see Wx::ToolBar#get_tool_bitmap_size
     # @see  Wx::ToolBar#get_tool_size 
@@ -586,7 +596,7 @@ module Wx
     # 
     # Only applies to a tool that has been specified as a toggle tool.
     # @param toolId [Integer]  ID of the tool in question, as passed to {Wx::ToolBar#add_tool}.
-    # @param toggle [true,false]  If true, toggles the tool on, otherwise toggles it off.
+    # @param toggle [Boolean]  If true, toggles the tool on, otherwise toggles it off.
     # @return [void]
     def toggle_tool(toolId, toggle) end
     
@@ -596,7 +606,7 @@ module Wx
     #   @param label [String] 
     #   @param bmpNormal [Wx::BitmapBundle,Wx::Bitmap,Wx::Icon,Wx::Image] 
     #   @param bmpDisabled [Wx::BitmapBundle,Wx::Bitmap,Wx::Icon,Wx::Image] 
-    #   @param kind [ItemKind] 
+    #   @param kind [Wx::ItemKind] 
     #   @param clientData [Wx::Object] 
     #   @param shortHelp [String] 
     #   @param longHelp [String] 
@@ -621,21 +631,21 @@ module Wx
   class ToolBarToolBase < Object
   
     # @overload initialize(tbar=nil, toolid=Wx::StandardID::ID_SEPARATOR, label=(''), bmpNormal=Wx::NULL_BITMAP, bmpDisabled=Wx::NULL_BITMAP, kind=Wx::ItemKind::ITEM_NORMAL, clientData=nil, shortHelpString=(''), longHelpString=(''))
-    #   @param tbar [Wx::ToolBarBase] 
+    #   @param tbar [Wx::ToolBar] 
     #   @param toolid [Integer] 
     #   @param label [String] 
     #   @param bmpNormal [Wx::BitmapBundle,Wx::Bitmap,Wx::Icon,Wx::Image] 
     #   @param bmpDisabled [Wx::BitmapBundle,Wx::Bitmap,Wx::Icon,Wx::Image] 
-    #   @param kind [ItemKind] 
+    #   @param kind [Wx::ItemKind] 
     #   @param clientData [Wx::Object] 
     #   @param shortHelpString [String] 
     #   @param longHelpString [String] 
-    #   @return [ToolBarToolBase]
+    #   @return [Wx::ToolBarToolBase]
     # @overload initialize(tbar, control, label)
-    #   @param tbar [Wx::ToolBarBase] 
+    #   @param tbar [Wx::ToolBar] 
     #   @param control [Wx::Control] 
     #   @param label [String] 
-    #   @return [ToolBarToolBase]
+    #   @return [Wx::ToolBarToolBase]
     def initialize(*args) end
     
     # @return [Integer]
@@ -646,27 +656,27 @@ module Wx
     def get_control; end
     alias_method :control, :get_control
     
-    # @return [Wx::ToolBarBase]
+    # @return [Wx::ToolBar]
     def get_tool_bar; end
     alias_method :tool_bar, :get_tool_bar
     
-    # @return [true,false]
+    # @return [Boolean]
     def is_stretchable; end
     alias_method :stretchable?, :is_stretchable
     
-    # @return [true,false]
+    # @return [Boolean]
     def is_button; end
     alias_method :button?, :is_button
     
-    # @return [true,false]
+    # @return [Boolean]
     def is_control; end
     alias_method :control?, :is_control
     
-    # @return [true,false]
+    # @return [Boolean]
     def is_separator; end
     alias_method :separator?, :is_separator
     
-    # @return [true,false]
+    # @return [Boolean]
     def is_stretchable_space; end
     alias_method :stretchable_space?, :is_stretchable_space
     
@@ -674,22 +684,22 @@ module Wx
     def get_style; end
     alias_method :style, :get_style
     
-    # @return [ItemKind]
+    # @return [Wx::ItemKind]
     def get_kind; end
     alias_method :kind, :get_kind
     
     # @return [void]
     def make_stretchable; end
     
-    # @return [true,false]
+    # @return [Boolean]
     def is_enabled; end
     alias_method :enabled?, :is_enabled
     
-    # @return [true,false]
+    # @return [Boolean]
     def is_toggled; end
     alias_method :toggled?, :is_toggled
     
-    # @return [true,false]
+    # @return [Boolean]
     def can_be_toggled; end
     alias_method :can_be_toggled?, :can_be_toggled
     

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

@@ -16,7 +16,7 @@ module Wx
   
     # Constructor.
     # @param tip [String] 
-    # @return [ToolTip]
+    # @return [Wx::ToolTip]
     def initialize(tip) end
     
     # Get the tooltip text.
@@ -37,7 +37,7 @@ module Wx
     
     # Enable or disable tooltips globally.
     # May not be supported on all platforms (eg. {Wx::Cocoa}).
-    # @param flag [true,false] 
+    # @param flag [Boolean] 
     # @return [void]
     def self.enable(flag) end
     
@@ -53,14 +53,6 @@ module Wx
     # @return [void]
     def self.set_delay(msecs) end
     
-    # Set tooltip maximal width in pixels.
-    # By default, tooltips are wrapped at a suitably chosen width. You can pass -1 as width to disable wrapping them completely, 0 to restore the default behaviour or an arbitrary positive value to wrap them at the given width.
-    # Notice that this function does not change the width of the tooltips created before calling it.
-    # Currently this function is {Wx::MSW}-only.
-    # @param width [Integer] 
-    # @return [void]
-    def self.set_max_width(width) end
-    
     # Set the delay between subsequent tooltips to appear.
     # May not be supported on all platforms (eg. {Wx::Cocoa}, GTK).
     # @param msecs [Integer] 

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

@@ -26,8 +26,9 @@ module Wx
   # === Styles
   # 
   # This class supports the following styles:
-  #  
+  # 
   # - {Wx::TBK_BUTTONBAR}: Use {Wx::ButtonToolBar}-based implementation under macOS (ignored under other platforms). 
+  # 
   # - {Wx::TBK_HORZ_LAYOUT}: Shows the text and the icons alongside, not vertically stacked (only implement under Windows and GTK 2 platforms as it relies on {Wx::TB_HORZ_LAYOUT} flag support). 
   # 
   # The common {Wx::BookCtrl} styles described in the wxBookCtrl Overview are also supported.
@@ -35,7 +36,9 @@ module Wx
   # 
   # The following event-handler methods redirect the events to member method or handler blocks for {Wx::BookCtrlEvent} events.
   # Event handler methods for events emitted by this class:
+  # 
   # - {Wx::EvtHandler#evt_toolbook_page_changed}(id, meth = nil, &block): The page selection was changed. Processes a {Wx::EVT_TOOLBOOK_PAGE_CHANGED} event. 
+  # 
   # - {Wx::EvtHandler#evt_toolbook_page_changing}(id, meth = nil, &block): The page selection is about to be changed. Processes a {Wx::EVT_TOOLBOOK_PAGE_CHANGING} event. This event can be vetoed (using {Wx::NotifyEvent#veto}). 
   # 
   # === 
@@ -51,7 +54,7 @@ module Wx
   
     # @overload initialize()
     #   Constructs a choicebook control.
-    #   @return [Toolbook]
+    #   @return [Wx::Toolbook]
     # @overload initialize(parent, id, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=0, name=(''))
     #   Constructs a choicebook control.
     #   @param parent [Wx::Window] 
@@ -60,7 +63,7 @@ module Wx
     #   @param size [Array(Integer, Integer), Wx::Size] 
     #   @param style [Integer] 
     #   @param name [String] 
-    #   @return [Toolbook]
+    #   @return [Wx::Toolbook]
     def initialize(*args) end
     
     # Create the tool book control that has already been constructed with the default constructor.
@@ -70,11 +73,11 @@ module Wx
     # @param size [Array(Integer, Integer), Wx::Size] 
     # @param style [Integer] 
     # @param name [String] 
-    # @return [true,false]
+    # @return [Boolean]
     def create(parent, id, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=0, name=('')) end
     
     # Returns the {Wx::ToolBarBase} associated with the control.
-    # @return [Wx::ToolBarBase]
+    # @return [Wx::ToolBar]
     def get_tool_bar; end
     alias_method :tool_bar, :get_tool_bar
     
@@ -85,16 +88,16 @@ module Wx
     #   
     #   true if successful, false otherwise (currently only if the index is invalid).
     #   @param page [Integer]  The index of the page.
-    #   @param enable [true,false]  true to enable the page and false to disable it.
-    #   @return [true,false]
+    #   @param enable [Boolean]  true to enable the page and false to disable it.
+    #   @return [Boolean]
     # @overload enable_page(page, enable)
     #   Enables or disables the specified page.
     #   This is similar to the overload above, but finds the index of the specified page.
     #   
     #   true if successful, false otherwise, e.g. if page is not one of the pages of this control.
     #   @param page [Wx::Window]  Pointer of a page windows inside the book control.
-    #   @param enable [true,false]  true to enable the page and false to disable it.
-    #   @return [true,false]
+    #   @param enable [Boolean]  true to enable the page and false to disable it.
+    #   @return [Boolean]
     def enable_page(*args) end
     
   end # Toolbook