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

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

@@ -579,15 +579,6 @@ module Wx
   
     include Wx::TextEntry
   
-    # Enable the automatic replacement of new lines characters in a single-line text field with spaces under macOS.
-    # This feature is enabled by default and will replace any new line (<code>\n</code>) character entered into a single-line text field with the space character. Usually single-line text fields are not expected to hold multiple lines of text (that is what {Wx::TE_MULTILINE} is for, after all) and it is impossible to have multiple lines of text in them under non-Mac platforms. However, under macOS/Cocoa, a single-line text control can still show multiple lines and this function allows to lift the restriction preventing multiple lines from being entered unless {Wx::TE_MULTILINE} is specified.
-    # This function is only available for macOS/Cocoa. It also has no effect if the {Wx::TE_MULTILINE} flag is set on a text control.
-    # 
-    # Availability:  only available for the wxOSX/Cocoa port.  {Wx::osx}
-    # @param enable [true,false] 
-    # @return [void]
-    def osx_enable_new_line_replacement(enable) end
-    
     # @overload initialize()
     #   Default ctor.
     #   @return [Wx::TextCtrl]
@@ -617,7 +608,7 @@ module Wx
     # @param style [Integer] 
     # @param validator [Wx::Validator] 
     # @param name [String] 
-    # @return []
+    # @return [Boolean]
     def create(parent, id, value=(''), pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=0, validator=Wx::DEFAULT_VALIDATOR, name=Wx::TextCtrlNameStr) end
     
     # Resets the internal modified flag as if the current changes had been saved.
@@ -633,18 +624,9 @@ module Wx
     # The event object should be the same as the one passed to EVT_KEY_DOWN handler previously by wxWidgets. Please note that this function doesn't currently work correctly for all keys under any platform but MSW.
     # true if the event resulted in a change to the control, false otherwise.
     # @param event [Wx::KeyEvent] 
-    # @return []
+    # @return [Boolean]
     def emulate_key_press(event) end
     
-    # Enable or disable native spell checking on this text control if it is available on the current platform.
-    # Currently this is supported in wxMSW (when running under Windows 8 or later), wxGTK when using GTK 3 and wxOSX. In addition, wxMSW requires that the text control has the {Wx::TE_RICH2} style set, while wxOSX requires that the control has the {Wx::TE_MULTILINE} style.
-    # When using wxGTK, this method only works if gspell library was available during the library build.
-    # 
-    # true if proof checking has been successfully enabled or disabled, false otherwise (usually because the corresponding functionality is not available under the current platform or for this type of text control).
-    # @param options [Wx::TextProofOptions]  A {Wx::TextProofOptions} object specifying the desired behaviour of the proof checker (e.g. language to use, spell check, grammar check, etc.) and whether the proof checks should be enabled at all. By default, spelling checks for the current language are enabled. Passing Wx::TextProofOptions#disable disables all the checks.
-    # @return []
-    def enable_proof_check(options=(Wx::TextProofOptions.default())) end
-    
     # Returns the style currently used for the new text.
     # 
     # @see Wx::TextCtrl#set_default_style 
@@ -680,7 +662,7 @@ module Wx
     # @see  Wx::TextAttr 
     # @param position [Integer] 
     # @param style [Wx::TextAttr] 
-    # @return []
+    # @return [Boolean]
     def get_style(position, style) end
     alias_method :style, :get_style
     
@@ -690,20 +672,20 @@ module Wx
     # @see Wx::TextCtrl#position_to_xy
     # @see  Wx::TextCtrl#xy_to_position 
     # @param pt [Array(Integer, Integer), Wx::Point]  The position of the point to check, in window device coordinates.
-    # @return [Array(TextCtrlHitTestResult,Integer,Integer)]
+    # @return [Array(Wx::TextCtrlHitTestResult,Integer,Integer)]
     def hit_test(pt) end
     
     # Returns true if the text has been modified by user.
     # Note that calling {Wx::TextCtrl#set_value} doesn't make the control modified.
     # @see Wx::TextCtrl#mark_dirty 
-    # @return []
+    # @return [Boolean]
     def is_modified; end
     alias_method :modified?, :is_modified
     
     # Returns true if this is a multi line edit control and false otherwise.
     # 
     # @see Wx::TextCtrl#is_single_line 
-    # @return []
+    # @return [Boolean]
     def is_multi_line; end
     alias_method :multi_line?, :is_multi_line
     
@@ -711,21 +693,15 @@ module Wx
     # 
     # @see Wx::TextCtrl#is_single_line
     # @see  Wx::TextCtrl#is_multi_line 
-    # @return []
+    # @return [Boolean]
     def is_single_line; end
     alias_method :single_line?, :is_single_line
     
-    # Returns the current text proofing options.
-    # This function is implemented for the same platforms as {Wx::TextCtrl#enable_proof_check} and returns {Wx::TextProofOptions} with all checks disabled, i.e. such that Wx::TextProofOptions#any_checks_enabled returns false.
-    # @return [Wx::TextProofOptions]
-    def get_proof_check_options; end
-    alias_method :proof_check_options, :get_proof_check_options
-    
     # Loads and displays the named file, if it exists.
     # true if successful, false otherwise.
     # @param filename [String]  The filename of the file to load.
     # @param fileType [Integer]  The type of file to load. This is currently ignored in {Wx::TextCtrl}.
-    # @return []
+    # @return [Boolean]
     def load_file(filename, fileType=Wx::TEXT_TYPE_ANY) end
     
     # Mark text as modified (dirty).
@@ -745,7 +721,7 @@ module Wx
     # true on success, false on failure (most likely due to a too large position parameter).
     # @see Wx::TextCtrl#xy_to_position 
     # @param pos [Integer]  Position.
-    # @return [Array(,Array(Integer, Integer), nil)]
+    # @return [Array(Integer, Integer), nil]
     def position_to_xy(pos) end
     
     # Converts given text position to client coordinates in pixels.
@@ -763,7 +739,7 @@ module Wx
     # true if the operation was successful, false otherwise.
     # @param filename [String]  The name of the file in which to save the text.
     # @param fileType [Integer]  The type of file to save. This is currently ignored in {Wx::TextCtrl}.
-    # @return []
+    # @return [Boolean]
     def save_file(filename=(''), fileType=Wx::TEXT_TYPE_ANY) end
     
     # Changes the default style to use for the new text which is going to be added to the control.
@@ -774,7 +750,7 @@ module Wx
     # true on success, false if an error occurred (this may also mean that the styles are not supported under this platform).
     # @see Wx::TextCtrl#get_default_style 
     # @param style [Wx::TextAttr]  The style for the new text.
-    # @return []
+    # @return [Boolean]
     def set_default_style(style) end
     alias_method :default_style=, :set_default_style
     
@@ -782,7 +758,7 @@ module Wx
     # 
     # @see Wx::TextCtrl#mark_dirty
     # @see  Wx::TextCtrl#discard_edits 
-    # @param modified [true,false] 
+    # @param modified [Boolean] 
     # @return [void]
     def set_modified(modified) end
     alias_method :modified=, :set_modified
@@ -796,7 +772,7 @@ module Wx
     # @param start [Integer]  The start of the range to change.
     # @param end_ [Integer] 
     # @param style [Wx::TextAttr]  The new style for the range.
-    # @return []
+    # @return [Boolean]
     def set_style(start, end_, style) end
     
     # Makes the line containing the given position visible.

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

@@ -24,14 +24,14 @@ module Wx
     #   When margins are given as {Wx::Point}, x indicates the left and y the top margin. Use -1 to indicate that an existing value should be used.
     #   true if setting of all requested margins was successful.
     #   @param pt [Array(Integer, Integer), Wx::Point] 
-    #   @return [true,false]
+    #   @return [Boolean]
     # @overload set_margins(left, top=-1)
     #   Attempts to set the control margins.
     #   When margins are given as {Wx::Point}, x indicates the left and y the top margin. Use -1 to indicate that an existing value should be used.
     #   true if setting of all requested margins was successful.
     #   @param left [Integer] 
     #   @param top [Integer] 
-    #   @return [true,false]
+    #   @return [Boolean]
     def set_margins(*args) end
     alias_method :margins=, :set_margins
     
@@ -47,7 +47,7 @@ module Wx
     #   true if the auto-completion was enabled or false if the operation failed, typically because auto-completion is not supported by the current platform.
     #   @see Wx::TextEntry#auto_complete_file_names 
     #   @param choices [Array<String>] 
-    #   @return [true,false]
+    #   @return [Boolean]
     # @overload auto_complete(completer)
     #   Enable auto-completion using the provided completer object.
     #   This method should be used instead of {Wx::TextEntry#auto_complete} overload taking the array of possible completions if the total number of strings is too big as it allows returning the completions dynamically, depending on the text already entered by user and so is more efficient.
@@ -57,7 +57,7 @@ module Wx
     #   true if the auto-completion was enabled or false if the operation failed, typically because auto-completion is not supported by the current platform.
     #   @see Wx::TextCompleter 
     #   @param completer [Wx::TextCompleter]  The object to be used for generating completions if non-NULL. If it is NULL, auto-completion is disabled. The {Wx::TextEntry} object takes ownership of this pointer and will delete it in any case (i.e. even if this method returns false).
-    #   @return [true,false]
+    #   @return [Boolean]
     def auto_complete(*args) end
     
     # Call this function to enable auto-completion of the text typed in a single-line text control using all valid file system paths.
@@ -65,7 +65,7 @@ module Wx
     # 
     # true if the auto-completion was enabled or false if the operation failed, typically because auto-completion is not supported by the current platform.
     # @see Wx::TextEntry#auto_complete 
-    # @return [true,false]
+    # @return [Boolean]
     def auto_complete_file_names; end
     
     # Call this function to enable auto-completion of the text using the file system directories.
@@ -74,32 +74,32 @@ module Wx
     # 
     # true if the auto-completion was enabled or false if the operation failed, typically because auto-completion is not supported by the current platform.
     # @see Wx::TextEntry#auto_complete 
-    # @return [true,false]
+    # @return [Boolean]
     def auto_complete_directories; end
     
     # Returns true if the selection can be copied to the clipboard.
-    # @return [true,false]
+    # @return [Boolean]
     def can_copy; end
     alias_method :can_copy?, :can_copy
     
     # Returns true if the selection can be cut to the clipboard.
-    # @return [true,false]
+    # @return [Boolean]
     def can_cut; end
     alias_method :can_cut?, :can_cut
     
     # Returns true if the contents of the clipboard can be pasted into the text control.
     # On some platforms (Motif, GTK) this is an approximation and returns true if the control is editable, false otherwise.
-    # @return [true,false]
+    # @return [Boolean]
     def can_paste; end
     alias_method :can_paste?, :can_paste
     
     # Returns true if there is a redo facility available and the last operation can be redone.
-    # @return [true,false]
+    # @return [Boolean]
     def can_redo; end
     alias_method :can_redo?, :can_redo
     
     # Returns true if there is an undo facility available and the last operation can be undone.
-    # @return [true,false]
+    # @return [Boolean]
     def can_undo; end
     alias_method :can_undo?, :can_undo
     
@@ -180,13 +180,13 @@ module Wx
     
     # Returns true if the controls contents may be edited by user (note that it always can be changed by the program).
     # In other words, this functions returns true if the control hasn't been put in read-only mode by a previous call to {Wx::TextEntry#set_editable}.
-    # @return [true,false]
+    # @return [Boolean]
     def is_editable; end
     alias_method :editable?, :is_editable
     
     # Returns true if the control is currently empty.
     # This is the same as <code>Wx::TextEntry#get_value</code>.empty() but can be much more efficient for the multiline controls containing big amounts of text.
-    # @return [true,false]
+    # @return [Boolean]
     def is_empty; end
     alias_method :empty?, :is_empty
     
@@ -217,7 +217,7 @@ module Wx
     # Makes the text item editable or read-only, overriding the <b>{Wx::TE_READONLY}</b> flag.
     # 
     # @see Wx::TextEntry#is_editable 
-    # @param editable [true,false]  If true, the control is editable. If false, the control is read-only.
+    # @param editable [Boolean]  If true, the control is editable. If false, the control is read-only.
     # @return [void]
     def set_editable(editable) end
     alias_method :editable=, :set_editable
@@ -271,7 +271,7 @@ module Wx
     # Another limitation is that hints are ignored for the controls with {Wx::TE_PASSWORD} style.
     # Hints can be used for single line text controls under all platforms, but only MSW and GTK+ 2 support them for multi-line text controls, they are ignored for them under the other platforms.
     # @param hint [String] 
-    # @return [true,false]
+    # @return [Boolean]
     def set_hint(hint) end
     alias_method :hint=, :set_hint
     
@@ -325,7 +325,7 @@ module Wx
     # 
     # true to continue with calling {Wx::TextCompleter#get_next} or false to indicate that there are no matches and {Wx::TextCompleter#get_next} shouldn't be called at all.
     # @param prefix [String]  The prefix for which completions are to be generated.
-    # @return [true,false]
+    # @return [Boolean]
     def start(prefix) end
     
     # Called to retrieve the next completion.

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

@@ -24,7 +24,7 @@ module Wx
   # @param parent [Wx::Window] 
   # @param x [Integer] 
   # @param y [Integer] 
-  # @param centre [true,false] 
+  # @param centre [Boolean] 
   # @return [String]
   def self.get_text_from_user(message, caption=Wx::GET_TEXT_FROM_USER_PROMPT_STR, default_value=(''), parent=nil, x=Wx::DEFAULT_COORD, y=Wx::DEFAULT_COORD, centre=true) end
   
@@ -36,7 +36,7 @@ module Wx
   # @param parent [Wx::Window] 
   # @param x [Integer] 
   # @param y [Integer] 
-  # @param centre [true,false] 
+  # @param centre [Boolean] 
   # @return [String]
   def self.get_password_from_user(message, caption=Wx::GET_PASSWORD_FROM_USER_PROMPT_STR, default_value=(''), parent=nil, x=Wx::DEFAULT_COORD, y=Wx::DEFAULT_COORD, centre=true) end
   
@@ -80,7 +80,7 @@ module Wx
     #   ```
     #   
     #   The first overload uses the provided validator which can be of a custom class derived from {Wx::TextValidator} while the second one creates a {Wx::TextValidator} with the specified style.
-    #   @param style [TextValidatorStyle] 
+    #   @param style [Wx::TextValidatorStyle] 
     #   @return [void]
     def set_text_validator(*args) end
     alias_method :text_validator=, :set_text_validator
@@ -108,7 +108,7 @@ module Wx
     # @param value [String]  The default value, which may be the empty string.
     # @param style [Integer]  A dialog style, specifying the buttons ({Wx::OK}, {Wx::CANCEL}) and an optional {Wx::GeometryCentre::CENTRE} style. Additionally, most {Wx::TextCtrl} styles (such as {Wx::TE_PASSWORD} or {Wx::TE_MULTILINE}) may be specified here, but {Wx::TE_READONLY} may not be used, as it doesn't make sense for this dialog, used for text input.
     # @param pos [Array(Integer, Integer), Wx::Point]  Dialog position.
-    # @return [true,false]
+    # @return [Boolean]
     def create(parent, message, caption=Wx::GET_TEXT_FROM_USER_PROMPT_STR, value=(''), style=Wx::TextEntryDialogStyle, pos=Wx::DEFAULT_POSITION) end
     
     # Returns the text that the user has entered if the user has pressed OK, or the original value if the user has pressed Cancel.

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

@@ -112,16 +112,11 @@ module Wx
     alias_method :style, :get_style
     
     # Returns true if the given style bit is set in the current style.
-    # @param style [TextValidatorStyle] 
-    # @return [true,false]
+    # @param style [Wx::TextValidatorStyle] 
+    # @return [Boolean]
     def has_flag(style) end
     alias_method :has_flag?, :has_flag
     
-    # Receives character input from the window and filters it according to the current validator style.
-    # @param event [Wx::KeyEvent] 
-    # @return [void]
-    def on_char(event) end
-    
     # Sets the exclude list (invalid values for the user input).
     # Beware that exclusion takes priority over inclusion.
     # @param stringList [Array<String>] 
@@ -186,7 +181,7 @@ module Wx
     
     # Validates the window contents against the include or exclude lists, depending on the validator style.
     # @param parent [Wx::Window] 
-    # @return [true,false]
+    # @return [Boolean]
     def validate(parent) end
     
     # Returns the error message if the contents of val are invalid or the empty string if val is valid.

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

@@ -37,7 +37,7 @@ module Wx
     # @overload initialize()
     #   Default constructor.
     #   @return [Wx::TimePickerCtrl]
-    # @overload initialize(parent, id, dt=Wx::DefaultDateTime, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=Wx::TP_DEFAULT, validator=Wx::DEFAULT_VALIDATOR, name=Wx::TimePickerCtrlNameStr)
+    # @overload initialize(parent, id, dt=Wx::DEFAULT_DATE_TIME, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=Wx::TP_DEFAULT, validator=Wx::DEFAULT_VALIDATOR, name=Wx::TimePickerCtrlNameStr)
     #   Initializes the object and calls {Wx::TimePickerCtrl#create} with all the parameters.
     #   @param parent [Wx::Window] 
     #   @param id [Integer] 
@@ -62,13 +62,13 @@ module Wx
     # @param style [Integer]  The window style, should be left at 0 as there are no special styles for this control in this version.
     # @param validator [Wx::Validator]  Validator which can be used for additional checks.
     # @param name [String]  Control name.
-    # @return [true,false]
-    def create(parent, id, dt=Wx::DefaultDateTime, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=Wx::TP_DEFAULT, validator=Wx::DEFAULT_VALIDATOR, name=Wx::TimePickerCtrlNameStr) end
+    # @return [Boolean]
+    def create(parent, id, dt=Wx::DEFAULT_DATE_TIME, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=Wx::TP_DEFAULT, validator=Wx::DEFAULT_VALIDATOR, name=Wx::TimePickerCtrlNameStr) end
     
     # Returns the currently entered time as hours, minutes and seconds.
     # All the arguments must be non-NULL, false is returned otherwise and none of them is modified.
     # @see Wx::TimePickerCtrl#set_time
-    # @return [Array(true,false,Integer,Integer,Integer)]
+    # @return [Array(Boolean,Integer,Integer,Integer)]
     def get_time; end
     alias_method :time, :get_time
     
@@ -86,7 +86,7 @@ module Wx
     # @param hour [Integer]  The new hour value in 0..23 interval.
     # @param min [Integer]  The new minute value in 0..59 interval.
     # @param sec [Integer]  The new second value in 0..59 interval.
-    # @return [true,false]
+    # @return [Boolean]
     def set_time(hour, min, sec) end
     
     # Changes the current value of the control.

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

@@ -54,12 +54,12 @@ module Wx
     alias_method :owner, :get_owner
     
     # Returns true if the timer is one shot, i.e. if it will stop after firing the first notification automatically.
-    # @return [true,false]
+    # @return [Boolean]
     def is_one_shot; end
     alias_method :one_shot?, :is_one_shot
     
     # Returns true if the timer is running, false if it is stopped.
-    # @return [true,false]
+    # @return [Boolean]
     def is_running; end
     alias_method :running?, :is_running
     
@@ -87,14 +87,14 @@ module Wx
     # 
     # If the timer was already running, it will be stopped by this method before restarting it.
     # @param milliseconds [Integer] 
-    # @param oneShot [true,false] 
-    # @return [true,false]
+    # @param oneShot [Boolean] 
+    # @return [Boolean]
     def start(milliseconds=-1, oneShot=Wx::TIMER_CONTINUOUS) end
     
     # Starts the timer for a once-only notification.
     # This is a simple wrapper for {Wx::Timer#start} with {Wx::TIMER_ONE_SHOT} parameter.
     # @param milliseconds [Integer] 
-    # @return [true,false]
+    # @return [Boolean]
     def start_once(milliseconds=-1) end
     
     # Stops the timer.

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

@@ -19,8 +19,8 @@ module Wx
   # @see wxTipProvider Overview
   # @param parent [Wx::Window]  The parent window for the modal dialog.
   # @param tipProvider [Wx::TipProvider]  An object which is used to get the text of the tips. It may be created with the {create_file_tip_provider} function.
-  # @param showAtStartup [true,false]  Should be true if startup tips are shown, false otherwise. This is used as the initial value for "Show tips at startup" checkbox which is shown in the tips dialog.
-  # @return [true,false]
+  # @param showAtStartup [Boolean]  Should be true if startup tips are shown, false otherwise. This is used as the initial value for "Show tips at startup" checkbox which is shown in the tips dialog.
+  # @return [Boolean]
   def self.show_tip(parent, tipProvider, showAtStartup=true) end
   
   # This is the class used together with {show_tip} function.

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

@@ -54,7 +54,7 @@ module Wx
     def initialize(*args) end
     
     # Creates the toggle button for two-step construction.
-    # See {Wx::ToggleButton#toggle_button} for details.
+    # See {Wx::ToggleButton#initialize} for details.
     # @param parent [Wx::Window] 
     # @param id [Integer] 
     # @param label [String] 
@@ -63,18 +63,18 @@ module Wx
     # @param style [Integer] 
     # @param val [Wx::Validator] 
     # @param name [String] 
-    # @return [true,false]
+    # @return [Boolean]
     def create(parent, id, label, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=0, val=Wx::DEFAULT_VALIDATOR, name=Wx::CheckBoxNameStr) end
     
     # Gets the state of the toggle button.
     # Returns true if it is pressed, false otherwise.
-    # @return [true,false]
+    # @return [Boolean]
     def get_value; end
     alias_method :value, :get_value
     
     # Sets the toggle button to the given state.
     # This does not cause a EVT_TOGGLEBUTTON event to be emitted.
-    # @param state [true,false]  If true, the button is pressed.
+    # @param state [Boolean]  If true, the button is pressed.
     # @return [void]
     def set_value(state) end
     alias_method :value=, :set_value

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

@@ -183,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.
@@ -199,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}.
@@ -218,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] 
@@ -318,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.
@@ -331,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
     
@@ -371,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.
@@ -394,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
     
@@ -448,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
     
@@ -490,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.
@@ -503,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.
@@ -519,7 +512,7 @@ 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.
@@ -603,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
     
@@ -613,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] 
@@ -638,18 +631,18 @@ 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 [Wx::ToolBarToolBase]
     # @overload initialize(tbar, control, label)
-    #   @param tbar [Wx::ToolBarBase] 
+    #   @param tbar [Wx::ToolBar] 
     #   @param control [Wx::Control] 
     #   @param label [String] 
     #   @return [Wx::ToolBarToolBase]
@@ -663,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
     
@@ -691,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