wxruby3 0.9.1-x64-mingw-ucrt → 0.9.2-x64-mingw-ucrt

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

@@ -18,6 +18,7 @@ module Wx
   # 
   # 
   # 
+  # @wxrb_require USE_COMBOCTRL
   class OwnerDrawnComboBoxPaintingFlags < Wx::Enum
   
     # Combo control is being painted, instead of a list item.
@@ -41,15 +42,15 @@ module Wx
   # A combo control is a generic combobox that allows totally custom popup.
   # In addition it has other customization features. For instance, position and size of the dropdown button can be changed.
   # 
-  # == Setting Custom Popup for wxComboCtrl
+  # ## Setting Custom Popup for wxComboCtrl
   # 
   # {Wx::ComboCtrl} needs to be told somehow which control to use and this is done by {Wx::ComboCtrl#set_popup_control}. However, we need something more than just a {Wx::Control} in this method as, for example, we need to call SetStringValue("initial text value") and {Wx::Control} doesn't have such method. So we also need a {Wx::ComboPopup} which is an interface which must be implemented by a control to be usable as a popup.
   # We couldn't derive {Wx::ComboPopup} from {Wx::Control} as this would make it impossible to have a class deriving from a wxWidgets control and from it, so instead it is just a mix-in.
   # Here's a minimal sample of {Wx::ListView} popup:
   # 
   # ```
-  #   #include <wx/combo.h>
-  #   #include <wx/listctrl.h>
+  #   \#include <wx/combo.h>
+  #   \#include <wx/listctrl.h>
   #   
   #   class wxListViewComboPopup : public wxListView, public wxComboPopup
   #   {
@@ -131,7 +132,7 @@ module Wx
   #   popupCtrl->InsertItem(popupCtrl->GetItemCount(), "Third Item");
   # ```
   # 
-  # === Styles
+  # ### Styles
   # 
   # This class supports the following styles:
   # 
@@ -145,7 +146,7 @@ module Wx
   # 
   # - {Wx::CC_STD_BUTTON}: Drop button will behave more like a standard push button. 
   # 
-  # === Events emitted by this class
+  # ### 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:
@@ -158,11 +159,9 @@ module Wx
   # 
   # - {Wx::EvtHandler#evt_combobox_closeup}(id, meth = nil, &block): Process a {Wx::EVT_COMBOBOX_CLOSEUP} event, which is generated when the popup window of the combo control disappears (closes up). You should avoid adding or deleting items in this event. 
   # 
-  # === 
-  # 
-  # Category:  {Wx::Controls}  <div class='appearance'><span class='appearance'>Appearance:</span><table><tr><td> wxMSW Appearance
-  #   </td><td> wxGTK Appearance
-  #   </td><td> wxOSX 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::ComboBox
   # @see  Wx::Choice
@@ -171,6 +170,7 @@ module Wx
   # @see  Wx::CommandEvent 
   # 
   # 
+  # @wxrb_require USE_COMBOCTRL
   class ComboCtrl < Control
   
     include Wx::TextEntry
@@ -304,7 +304,11 @@ module Wx
     alias_method :hint, :get_hint
     
     # Returns the insertion point for the combo control's text field.
-    # Under Windows, this function always returns 0 if the combo control doesn't have the focus.
+    # <div class="wxrb-note">
+    # <b>Note:</b>
+    # <p>Under Windows, this function always returns 0 if the combo control doesn't have the focus. 
+    # </p>
+    # </div>
     # @return [Integer]
     def get_insertion_point; end
     alias_method :insertion_point, :get_insertion_point
@@ -316,7 +320,12 @@ module Wx
     
     # Returns the margins used by the control.
     # The x field of the returned point is the horizontal margin and the y field is the vertical one.
-    # If given margin cannot be accurately determined, its value will be set to -1.
+    # 
+    # <div class="wxrb-remark">
+    # <b>Remark:</b>
+    # <p>If given margin cannot be accurately determined, its value will be set to -1.
+    # </p>
+    # </div>>
     # @see Wx::ComboCtrl#set_margins
     # @return [Wx::Point]
     def get_margins; end
@@ -371,7 +380,12 @@ module Wx
     
     # Implement in a derived class to define what happens on dropdown button click.
     # Default action is to show the popup.
-    # If you implement this to do something else than show the popup, you must then also implement {Wx::ComboCtrl#do_set_popup_control} to always return NULL.
+    # 
+    # <div class="wxrb-note">
+    # <b>Note:</b>
+    # <p>If you implement this to do something else than show the popup, you must then also implement {Wx::ComboCtrl#do_set_popup_control} to always return NULL. 
+    # </p>
+    # </div>
     # @return [void]
     def on_button_click; end
     
@@ -485,14 +499,22 @@ module Wx
     alias_method :popup_control=, :set_popup_control
     
     # Extends popup size horizontally, relative to the edges of the combo control.
-    # Popup minimum width may override arguments. It is up to the popup to fully take this into account.
+    # <div class="wxrb-remark">
+    # <b>Remark:</b>
+    # <p>Popup minimum width may override arguments. It is up to the popup to fully take this into account. 
+    # </p>
+    # </div>>
     # @param extLeft [Integer]  How many pixel to extend beyond the left edge of the control. Default is 0.
     # @param extRight [Integer]  How many pixel to extend beyond the right edge of the control. Default is 0.
     # @return [void]
     def set_popup_extents(extLeft, extRight) end
     
     # Sets preferred maximum height of the popup.
-    # Value -1 indicates the default.
+    # <div class="wxrb-remark">
+    # <b>Remark:</b>
+    # <p>Value -1 indicates the default. 
+    # </p>
+    # </div>>
     # @param height [Integer] 
     # @return [void]
     def set_popup_max_height(height) end
@@ -500,7 +522,12 @@ module Wx
     
     # Sets minimum width of the popup.
     # If wider than combo control, it will extend to the left.
-    # Value -1 indicates the default. Also, popup implementation may choose to ignore this.
+    # 
+    # <div class="wxrb-remark">
+    # <b>Remark:</b>
+    # <p>Value -1 indicates the default. Also, popup implementation may choose to ignore this. 
+    # </p>
+    # </div>>
     # @param width [Integer] 
     # @return [void]
     def set_popup_min_width(width) end
@@ -536,7 +563,11 @@ module Wx
     alias_method :text_ctrl_style=, :set_text_ctrl_style
     
     # Sets the text for the combo control text field.
-    # For a combo control with {Wx::CB_READONLY} style the string must be accepted by the popup (for instance, exist in the dropdown list), otherwise the call to {Wx::ComboCtrl#set_value} is ignored.
+    # <div class="wxrb-note">
+    # <b>Note:</b>
+    # <p>For a combo control with {Wx::CB_READONLY} style the string must be accepted by the popup (for instance, exist in the dropdown list), otherwise the call to {Wx::ComboCtrl#set_value} is ignored. 
+    # </p>
+    # </div>
     # @param value [String] 
     # @return [void]
     def set_value(value) end
@@ -579,7 +610,12 @@ module Wx
     
     # This member function is not normally called in application code.
     # Instead, it can be implemented in a derived class to return default {Wx::ComboPopup}, in case popup is NULL.
-    # If you have implemented {Wx::ComboCtrl#on_button_click} to do something else than show the popup, then {Wx::ComboCtrl#do_set_popup_control} must always set popup to NULL.
+    # 
+    # <div class="wxrb-note">
+    # <b>Note:</b>
+    # <p>If you have implemented {Wx::ComboCtrl#on_button_click} to do something else than show the popup, then {Wx::ComboCtrl#do_set_popup_control} must always set popup to NULL. 
+    # </p>
+    # </div>
     # @param popup [Wx::ComboPopup] 
     # @return [void]
     def do_set_popup_control(popup) end
@@ -595,7 +631,6 @@ module Wx
   
   # In order to use a custom popup with {Wx::ComboCtrl}, an interface class must be derived from {Wx::ComboPopup}.
   # For more information on how to use it, see Setting Custom Popup for wxComboCtrl.
-  # === 
   # 
   # Category:  {Wx::Controls}
   # @see Wx::ComboCtrl 
@@ -603,6 +638,7 @@ module Wx
   # 
   # 
   # @note  In wxRuby this is a mixin module instead of a (base) class.
+  # @wxrb_require USE_COMBOCTRL
   module ComboPopup
   
     # Default constructor.
@@ -627,14 +663,22 @@ module Wx
     def dismiss; end
     
     # Implement to customize matching of value string to an item container entry.
-    # Default implementation always return true and does not alter trueItem.
+    # <div class="wxrb-remark">
+    # <b>Remark:</b>
+    # <p>Default implementation always return true and does not alter trueItem. 
+    # </p>
+    # </div>>
     # @param item [String]  String entered, usually by user or from SetValue() call.
     # @param trueItem [String]  When item matches an entry, but the entry's string representation is not exactly the same (case mismatch, for example), then the true item string should be written back to here, if it is not a NULL pointer.
     # @return [Boolean]
     def find_item(item, trueItem=nil) end
     
     # The derived class may implement this to return adjusted size for the popup control, according to the variables given.
-    # This function is called each time popup is about to be shown.
+    # <div class="wxrb-remark">
+    # <b>Remark:</b>
+    # <p>This function is called each time popup is about to be shown. 
+    # </p>
+    # </div>>
     # @param minWidth [Integer]  Preferred minimum width.
     # @param prefHeight [Integer]  Preferred height. May be -1 to indicate no preference.
     # @param maxHeight [Integer]  Max height for window, as limited by screen size.
@@ -670,7 +714,12 @@ module Wx
     
     # The derived class may implement this to return true if it wants to delay call to {Wx::ComboPopup#create} until the popup is shown for the first time.
     # It is more efficient, but on the other hand it is often more convenient to have the control created immediately.
-    # Base implementation returns false.
+    # 
+    # <div class="wxrb-remark">
+    # <b>Remark:</b>
+    # <p>Base implementation returns false. 
+    # </p>
+    # </div>>
     # @return [Boolean]
     def lazy_create; end
     
@@ -710,7 +759,7 @@ module Wx
   # {Wx::OwnerDrawnComboBox} is a combobox with owner-drawn list items.
   # In essence, it is a {Wx::ComboCtrl} with {Wx::VListBox} popup and {Wx::ControlWithItems} interface.
   # Implementing item drawing and measuring is similar to {Wx::VListBox}. Application needs to subclass {Wx::OwnerDrawnComboBox} and implement {Wx::OwnerDrawnComboBox#on_draw_item}, {Wx::OwnerDrawnComboBox#on_measure_item} and {Wx::OwnerDrawnComboBox#on_measure_item_width}.
-  # === Styles
+  # ### Styles
   # 
   # This class supports the following styles:
   # 
@@ -718,18 +767,16 @@ module Wx
   # 
   # - {Wx::ODCB_STD_CONTROL_PAINT}: Control itself is not custom painted using OnDrawItem. Even if this style is not used, writable {Wx::OwnerDrawnComboBox} is never custom painted unless {Wx::OwnerDrawnComboBox#set_custom_paint_width} is called. 
   # 
-  # === Events emitted by this class
+  # ### 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_combobox}(id, meth = nil, &block): Process a {Wx::EVT_COMBOBOX} event, when an item on the list is selected. Note that calling {Wx::OwnerDrawnComboBox#get_value} returns the new value of selection. 
   # 
-  # === 
-  # 
-  # Category:  {Wx::Controls}  <div class='appearance'><span class='appearance'>Appearance:</span><table><tr><td> wxMSW Appearance
-  #   </td><td> wxGTK Appearance
-  #   </td><td> wxOSX 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::ComboCtrl window styles and Window Styles.
   # 
@@ -741,12 +788,18 @@ module Wx
   # @see  Wx::CommandEvent 
   # 
   # 
+  # @wxrb_require USE_COMBOCTRL
   class OwnerDrawnComboBox < ComboCtrl
   
     # @overload create(parent, id, value=(''), pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=0, validator=Wx::DEFAULT_VALIDATOR, name=Wx::COMBO_BOX_NAME_STR)
     #   Creates the combobox for two-step construction.
     #   See {Wx::OwnerDrawnComboBox#initialize} for further details.
-    #   Derived classes should call or replace this function.
+    #   
+    #   <div class="wxrb-remark">
+    #   <b>Remark:</b>
+    #   <p>Derived classes should call or replace this function. 
+    #   </p>
+    #   </div>>
     #   @param parent [Wx::Window] 
     #   @param id [Integer] 
     #   @param value [String] 
@@ -759,7 +812,12 @@ module Wx
     # @overload create(parent, id, value, pos, size, choices, style=0, validator=Wx::DEFAULT_VALIDATOR, name=Wx::COMBO_BOX_NAME_STR)
     #   Creates the combobox for two-step construction.
     #   See {Wx::OwnerDrawnComboBox#initialize} for further details.
-    #   Derived classes should call or replace this function.
+    #   
+    #   <div class="wxrb-remark">
+    #   <b>Remark:</b>
+    #   <p>Derived classes should call or replace this function. 
+    #   </p>
+    #   </div>>
     #   @param parent [Wx::Window] 
     #   @param id [Integer] 
     #   @param value [String] 
@@ -924,7 +982,12 @@ module Wx
     
     # This method is used to draw the items background and, maybe, a border around it.
     # The base class version implements a reasonable default behaviour which consists in drawing the selected item with the standard background colour and drawing a border around the item if it is either selected or current.
-    # flags has the same meaning as with {Wx::OwnerDrawnComboBox#on_draw_item}.
+    # 
+    # <div class="wxrb-remark">
+    # <b>Remark:</b>
+    # <p>flags has the same meaning as with {Wx::OwnerDrawnComboBox#on_draw_item}. 
+    # </p>
+    # </div>>
     # @param dc [Wx::DC] 
     # @param rect [Wx::Rect] 
     # @param item [Integer] 

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

@@ -13,16 +13,15 @@ module Wx
   # {Wx::CommandLinkButton} generates the same event as {Wx::Button} but doesn't support any of {Wx::Button}-specific styles nor adds any new styles of its own.
   # Currently this class uses native implementation under Windows Vista and later versions and a generic implementation for the other platforms and earlier Windows versions.
   # 
-  # === 
-  # 
-  # Category:  {Wx::Controls}  <div class='appearance'><span class='appearance'>Appearance:</span><table><tr><td> wxMSW Appearance
-  #   </td><td> wxGTK Appearance
-  #   </td><td> wxOSX 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::Button
   # @see  Wx::BitmapButton 
   # 
   # 
+  # @wxrb_require USE_BUTTON
   class CommandLinkButton < Button
   
     # @overload initialize()

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

@@ -9,17 +9,21 @@ module Wx
   # Instances of this class may be used to add a question mark button that when pressed, puts the application into context-help mode.
   # It does this by creating a {Wx::ContextHelp} object which itself generates a {Wx::EVT_HELP} event when the user clicks on a window.
   # On Windows, you may add a question-mark icon to a dialog by use of the {Wx::DIALOG_EX_CONTEXTHELP} extra style, but on other platforms you will have to add a button explicitly, usually next to OK, Cancel or similar buttons.
-  # === 
   # 
   # Category:  {Wx::HELP}
   # @see Wx::BitmapButton
   # @see  Wx::ContextHelp 
   # 
   # 
+  # @wxrb_require USE_HELP
   class ContextHelpButton < BitmapButton
   
     # Constructor, creating and showing a context help button.
-    # Normally you only need pass the parent window to the constructor, and use the defaults for the remaining parameters.
+    # <div class="wxrb-remark">
+    # <b>Remark:</b>
+    # <p>Normally you only need pass the parent window to the constructor, and use the defaults for the remaining parameters. 
+    # </p>
+    # </div>>
     # @param parent [Wx::Window]  Parent window. Must not be NULL.
     # @param id [Integer]  Button identifier. Defaults to {Wx::StandardID::ID_CONTEXT_HELP}.
     # @param pos [Array(Integer, Integer), Wx::Point]  Button position. If {Wx::DEFAULT_POSITION} is specified then a default position is chosen.
@@ -48,7 +52,6 @@ module Wx
   # - Create a {Wx::ContextHelpButton}, whose predefined behaviour is to create a context help object. Normally you will write your application so that this button is only added to a dialog for non-Windows platforms (use {Wx::DIALOG_EX_CONTEXTHELP} on Windows).
   # 
   # Note that on macOS, the cursor does not change when in context-sensitive help mode.
-  # === 
   # 
   # Category:  {Wx::HELP}
   # @see Wx::HelpEvent
@@ -56,6 +59,7 @@ module Wx
   # @see  Wx::ContextHelpButton 
   # 
   # 
+  # @wxrb_require USE_HELP
   class ContextHelp < Object
   
     # Constructs a context help object, calling {Wx::ContextHelp#begin_context_help} if doNow is true (the default).

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

@@ -8,7 +8,7 @@ module Wx
 
   # This is the base class for a control or "widget".
   # A control is generally a small window which processes user input and/or displays one or more item of data.
-  # === Events emitted by this class
+  # ### Events emitted by this class
   # 
   # The following event-handler methods redirect the events to member method or handler blocks for {Wx::ClipboardTextEvent} events.
   # Event handler methods for events emitted by this class:
@@ -19,8 +19,6 @@ module Wx
   # 
   # - {Wx::EvtHandler#evt_text_paste}(id, meth = nil, &block): Clipboard content was pasted into the control. 
   # 
-  # === 
-  # 
   # Category:  {Wx::Controls}
   # @see Wx::Validator 
   # 
@@ -86,7 +84,7 @@ module Wx
     #            postcode.get_text_extent("99999")))
     #   ```
     #   
-    #   Currently this method is only implemented for {Wx::TextCtrl}, {Wx::ComboBox} and {Wx::Choice} in wxMSW and wxGTK.
+    #   Currently this method is only implemented for {Wx::TextCtrl}, {Wx::ComboBox} and {Wx::Choice} in WXMSW and WXGTK.
     #   
     #   The size that the control should have to leave the area of the specified size for its text. May return {Wx::DEFAULT_SIZE} if this method is not implemented for this particular control under the current platform.
     #   @param xlen [Integer]  The horizontal extent of the area to leave for text, in pixels.
@@ -138,7 +136,7 @@ module Wx
     #                         "<span foreground='red'>breakfast</span> "+
     #                         "available <big>HERE</big>")
     # ```
-    #  would show the string using bold, red and big for the corresponding words under wxGTK but will simply show the string "Bed &amp; breakfast
+    #  would show the string using bold, red and big for the corresponding words under WXGTK but will simply show the string "Bed &amp; breakfast
     # available HERE" on the other platforms. In any case, the "B" of "Bed" will be underlined to indicate that it can be used as a mnemonic for this control.
     # The supported tags are: 
     # <b>Tag</b> 
@@ -214,14 +212,18 @@ module Wx
     # 
     # true if the new label was set (even if markup in it was ignored) or false if we failed to parse the markup. In this case the label remains unchanged.
     # 
-    # Currently {Wx::Button} supports markup in all major ports (wxMSW, wxGTK and wxOSX/Cocoa) while {Wx::StaticText} supports it in wxGTK and wxOSX and its generic version (which can be used under MSW if markup support is required). Extending support to more controls is planned in the future.
-    # @param markup [String]  String containing markup for the label. It may contain markup tags described above and newline characters but currently only wxGTK and wxOSX support multiline labels with markup, the generic implementation (also used in wxMSW) only handles single line markup labels. Notice that the string must be well-formed (e.g. all tags must be correctly closed) and won't be shown at all otherwise.
+    # Currently {Wx::Button} supports markup in all major ports (WXMSW, WXGTK and WXOSX/Cocoa) while {Wx::StaticText} supports it in WXGTK and WXOSX and its generic version (which can be used under MSW if markup support is required). Extending support to more controls is planned in the future.
+    # @param markup [String]  String containing markup for the label. It may contain markup tags described above and newline characters but currently only WXGTK and WXOSX support multiline labels with markup, the generic implementation (also used in WXMSW) only handles single line markup labels. Notice that the string must be well-formed (e.g. all tags must be correctly closed) and won't be shown at all otherwise.
     # @return [Boolean]
     def set_label_markup(markup) end
     alias_method :label_markup=, :set_label_markup
     
     # Returns the given str string without mnemonics ("&" characters).
-    # This function is identical to {Wx::Control#get_label_text} and is provided mostly for symmetry with {Wx::Control.escape_mnemonics}.
+    # <div class="wxrb-note">
+    # <b>Note:</b>
+    # <p>This function is identical to {Wx::Control#get_label_text} and is provided mostly for symmetry with {Wx::Control.escape_mnemonics}. 
+    # </p>
+    # </div>
     # @param str [String] 
     # @return [String]
     def self.remove_mnemonics(str) end

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

@@ -8,7 +8,6 @@ module Wx
 
   # This is convenience class that derives from both {Wx::Control} and {Wx::ItemContainer}.
   # It is used as basis for some wxWidgets controls ({Wx::Choice} and {Wx::ListBox}).
-  # === 
   # 
   # Category:  {Wx::Controls}
   # @see Wx::ItemContainer

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

@@ -7,7 +7,7 @@
 module Wx
 
   # wxRuby version string
-  Wx::WXRUBY_VERSION = '0.9.1'
+  Wx::WXRUBY_VERSION = '0.9.2'
 
   # wxRuby version release type (alpha, beta, rc)
   Wx::WXRUBY_RELEASE_TYPE = ''
@@ -16,10 +16,10 @@ module Wx
   # wxRuby minor version number
   Wx::WXRUBY_MINOR = 9
   # wxRuby release number
-  Wx::WXRUBY_RELEASE = 1
+  Wx::WXRUBY_RELEASE = 2
 
   # Convenience string for WxWidgets version info
-  WXWIDGETS_VERSION = '3.2.3'
+  WXWIDGETS_VERSION = '3.2.4'
 
   # Integer constant reflecting the major version of the wxWidgets release used to build wxRuby
   WXWIDGETS_MAJOR_VERSION = 3
@@ -28,7 +28,7 @@ module Wx
   WXWIDGETS_MINOR_VERSION = 2
 
   # Integer constant reflecting the release number of the wxWidgets release used to build wxRuby
-  WXWIDGETS_RELEASE_NUMBER = 3
+  WXWIDGETS_RELEASE_NUMBER = 4
 
   # Integer constant reflecting the sub-release number of the wxWidgets release used to build wxRuby
   WXWIDGETS_SUBRELEASE_NUMBER = 0

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

@@ -19,8 +19,6 @@ module Wx
   # the cursor for a window, as in X, rather than to set it globally as in MS Windows, although a global 
   # {set_cursor} function is also available for MS Windows use.
   # 
-  # === 
-  # 
   # Category:  Graphics Device Interface (GDI)
   # Predefined objects/pointers:
   # - {Wx::NULL_CURSOR}
@@ -42,9 +40,9 @@ module Wx
     #   @return [Wx::Cursor]
     # @overload initialize(cursorName, type=Wx::CURSOR_DEFAULT_TYPE, hotSpotX=0, hotSpotY=0)
     #   Constructs a cursor by passing a string resource name or filename.
-    #   The arguments hotSpotX and hotSpotY are only used when there's no hotspot info in the resource/image-file to load (e.g. when using {Wx::BitmapType::BITMAP_TYPE_ICO} under wxMSW or {Wx::BitmapType::BITMAP_TYPE_XPM} under wxGTK).
+    #   The arguments hotSpotX and hotSpotY are only used when there's no hotspot info in the resource/image-file to load (e.g. when using {Wx::BitmapType::BITMAP_TYPE_ICO} under WXMSW or {Wx::BitmapType::BITMAP_TYPE_XPM} under WXGTK).
     #   @param cursorName [String]  The name of the resource or the image file to load.
-    #   @param type [Wx::BitmapType]  Icon type to load. It defaults to {Wx::CURSOR_DEFAULT_TYPE}, which is a #define associated to different values on different platforms:
+    #   @param type [Wx::BitmapType]  Icon type to load. It defaults to {Wx::CURSOR_DEFAULT_TYPE}, which is a \#define associated to different values on different platforms:
     #     
     #     - under Windows, it defaults to {Wx::BITMAP_TYPE_CUR_RESOURCE}. Other permitted types under Windows are {Wx::BitmapType::BITMAP_TYPE_CUR} (to load a cursor from a .cur cursor file), {Wx::BitmapType::BITMAP_TYPE_ICO} (to load a cursor from a .ico icon file) and {Wx::BitmapType::BITMAP_TYPE_ANI} (to load a cursor from a .ani icon file).
     #     - under MacOS, it defaults to {Wx::BITMAP_TYPE_MACCURSOR_RESOURCE}; when specifying a string resource name, first the color cursors 'crsr' and then the black/white cursors 'CURS' in the resource chain are scanned through. Note that resource forks are deprecated on macOS so this is only available for legacy reasons and should not be used in new code.
@@ -61,9 +59,9 @@ module Wx
     # @overload initialize(image)
     #   Constructs a cursor from a {Wx::Image}.
     #   If cursor are monochrome on the current platform, colors with the RGB elements all greater than 127 will be foreground, colors less than this background. The mask (if any) will be used to specify the transparent area.
-    #   In wxMSW the foreground will be white and the background black. If the cursor is larger than 32x32 it is resized.
-    #   In wxGTK, colour cursors and alpha channel are supported (starting from GTK+ 2.2). Otherwise the two most frequent colors will be used for foreground and background. In any case, the cursor will be displayed at the size of the image.
-    #   Under wxMac (Cocoa), large cursors are supported.
+    #   In WXMSW the foreground will be white and the background black. If the cursor is larger than 32x32 it is resized.
+    #   In WXGTK, colour cursors and alpha channel are supported (starting from GTK+ 2.2). Otherwise the two most frequent colors will be used for foreground and background. In any case, the cursor will be displayed at the size of the image.
+    #   Under WXOSX (Cocoa), large cursors are supported.
     #   Notice that the image can define the cursor hot spot. To set it you need to use {Wx::Image#set_option} with {Wx::IMAGE_OPTION_CUR_HOTSPOT_X} or {Wx::IMAGE_OPTION_CUR_HOTSPOT_Y}, e.g. 
     #   ```ruby
     #     image.set_option(Wx::IMAGE_OPTION_CUR_HOTSPOT_X, hotSpotX)
@@ -84,7 +82,7 @@ module Wx
     
     # Returns the coordinates of the cursor hot spot.
     # The hot spot is the point at which the mouse is actually considered to be when this cursor is used.
-    # This method is currently only implemented in wxMSW and wxGTK2+ and simply returns {Wx::DEFAULT_POSITION} in the other ports.
+    # This method is currently only implemented in WXMSW and WXGTK2+ and simply returns {Wx::DEFAULT_POSITION} in the other ports.
     # @return [Wx::Point]
     def get_hot_spot; end
     alias_method :hot_spot, :get_hot_spot

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

@@ -36,7 +36,6 @@ module Wx
   # 
   # As mentioned above, these standard formats may be passed to any function taking {Wx::DataFormat} argument because {Wx::DataFormat} has an implicit conversion from them (or, to be precise from the type {Wx::DataFormat::NativeFormat} which is the type used by the underlying platform for data formats).
   # Aside the standard formats, the application may also use custom formats which are identified by their names (strings) and not numeric identifiers. Although internally custom format must be created (or registered) first, you shouldn't care about it because it is done automatically the first time the {Wx::DataFormat} object corresponding to a given format name is created. The only implication of this is that you should avoid having global {Wx::DataFormat} objects with non-default constructor because their constructors are executed before the program has time to perform all necessary initialisations and so an attempt to do clipboard format registration at this time will usually lead to a crash!
-  # === 
   # 
   # Category:  Clipboard and Drag & Drop
   # @see Drag and Drop Overview
@@ -44,6 +43,7 @@ module Wx
   # @see  Wx::DataObject 
   # 
   # 
+  # @wxrb_require USE_CLIPBOARD
   class DataFormat < ::Object
   
     # @overload initialize(format=Wx::DataFormatId::DF_INVALID)
@@ -61,6 +61,11 @@ module Wx
     def get_id; end
     alias_method :id, :get_id
     
+    # Returns the platform-specific number identifying the format.
+    # @return [Wx::DataFormatId]
+    def get_type; end
+    alias_method :type, :get_type
+    
     # Sets the format to be the custom format identified by the given name.
     # @param format [String] 
     # @return [void]