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

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

@@ -14,28 +14,37 @@ module Wx
   # === Styles
   # 
   # This class supports the following styles:
-  #  
+  # 
   # - {Wx::CB_SIMPLE}: Creates a combobox with a permanently displayed list. Windows only. 
+  # 
   # - {Wx::CB_DROPDOWN}: Creates a combobox with a drop-down list. MSW and Motif only. 
+  # 
   # - {Wx::CB_READONLY}: A combobox with this style behaves like a {Wx::Choice} (and may look in the same way as well, although this is platform-dependent), i.e. it allows the user to choose from the list of options but doesn't allow to enter a value not present in the list. 
+  # 
   # - {Wx::CB_SORT}: Sorts the entries in the list alphabetically. 
+  # 
   # - {Wx::TE_PROCESS_ENTER}: The control will generate the event {Wx::EVT_TEXT_ENTER} that can be handled by the program. Otherwise, i.e. either if this style not specified at all, or it is used, but there is no event handler for this event or the event handler called {Wx::Event#skip} to avoid overriding the default handling, pressing Enter key is either processed internally by the control or used to activate the default button of the dialog, if any. 
   # 
   # === 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::ComboBox#get_value} returns the new value of selection. 
+  # 
   # - {Wx::EvtHandler#evt_text}(id, meth = nil, &block): Process a {Wx::EVT_TEXT} event, when the combobox text changes. 
+  # 
   # - {Wx::EvtHandler#evt_text_enter}(id, meth = nil, &block): Process a {Wx::EVT_TEXT_ENTER} event, when RETURN is pressed in the combobox (notice that the combobox must have been created with {Wx::TE_PROCESS_ENTER} style to receive this event). 
-  # - {Wx::EvtHandler#evt_combobox_dropdown}(id, meth = nil, &block): Process a {Wx::EVT_COMBOBOX_DROPDOWN} event, which is generated when the list box part of the combo box is shown (drops down). Notice that this event is only supported by {Wx::MSW}, {Wx::GTK} with GTK+ 2.10 or later, and {Wx::OSX}/Cocoa. 
+  # 
+  # - {Wx::EvtHandler#evt_combobox_dropdown}(id, meth = nil, &block): Process a {Wx::EVT_COMBOBOX_DROPDOWN} event, which is generated when the list box part of the combo box is shown (drops down). Notice that this event is only supported by wxMSW, wxGTK with GTK+ 2.10 or later, and wxOSX/Cocoa. 
+  # 
   # - {Wx::EvtHandler#evt_combobox_closeup}(id, meth = nil, &block): Process a {Wx::EVT_COMBOBOX_CLOSEUP} event, which is generated when the list box of the combo box disappears (closes up). This event is only generated for the same platforms as {Wx::EVT_COMBOBOX_DROPDOWN} above. 
   # 
   # === 
   # 
-  # Category:  {Wx::Controls}  <div class='appearance'><span class='appearance'>Appearance:</span><table><tr><td> {Wx::MSW} Appearance
-  #   </td><td> {Wx::GTK} Appearance
-  #   </td><td> {Wx::OSX} Appearance
+  # Category:  {Wx::Controls}  <div class='appearance'><span class='appearance'>Appearance:</span><table><tr><td> wxMSW Appearance
+  #   </td><td> wxGTK Appearance
+  #   </td><td> wxOSX Appearance
   #   </td></tr></table></div>
   # @see Wx::ListBox
   # @see  Wx::TextCtrl
@@ -77,7 +86,7 @@ module Wx
     
     # @overload initialize()
     #   Default constructor.
-    #   @return [ComboBox]
+    #   @return [Wx::ComboBox]
     # @overload initialize(parent, id, value=(''), pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, choices=nil, style=0, validator=Wx::DEFAULT_VALIDATOR, name=Wx::ComboBoxNameStr)
     #   Constructor, creating and showing a combobox.
     #   
@@ -92,7 +101,7 @@ module Wx
     #   @param style [Integer]  Window style. See {Wx::ComboBox}.
     #   @param validator [Wx::Validator]  Window validator.
     #   @param name [String]  Window name.
-    #   @return [ComboBox]
+    #   @return [Wx::ComboBox]
     # @overload initialize(parent, id, value, pos, size, choices, style=0, validator=Wx::DEFAULT_VALIDATOR, name=Wx::ComboBoxNameStr)
     #   Constructor, creating and showing a combobox.
     #   
@@ -107,7 +116,7 @@ module Wx
     #   @param style [Integer]  Window style. See {Wx::ComboBox}.
     #   @param validator [Wx::Validator]  Window validator.
     #   @param name [String]  Window name.
-    #   @return [ComboBox]
+    #   @return [Wx::ComboBox]
     def initialize(*args) end
     
     # Returns the item being selected right now.
@@ -117,7 +126,7 @@ module Wx
     alias_method :current_selection, :get_current_selection
     
     # Same as {Wx::TextEntry#get_insertion_point}.
-    # Under {Wx::MSW}, this function always returns 0 if the combobox doesn't have the focus.
+    # Under wxMSW, this function always returns 0 if the combobox doesn't have the focus.
     # @return [Integer]
     def get_insertion_point; end
     alias_method :insertion_point, :get_insertion_point
@@ -159,14 +168,14 @@ module Wx
     alias_method :value=, :set_value
     
     # Shows the list box portion of the combo box.
-    # Currently this method is implemented in {Wx::MSW}, {Wx::GTK} and {Wx::OSX}/Cocoa.
-    # Notice that calling this function will generate a {Wx::EVT_COMBOBOX_DROPDOWN} event except under {Wx::OSX} where generation of this event is not supported at all.
+    # Currently this method is implemented in wxMSW, wxGTK and wxOSX/Cocoa.
+    # Notice that calling this function will generate a {Wx::EVT_COMBOBOX_DROPDOWN} event except under wxOSX where generation of this event is not supported at all.
     # @return [void]
     def popup; end
     
     # Hides the list box portion of the combo box.
-    # Currently this method is implemented in {Wx::MSW}, {Wx::GTK} and {Wx::OSX}/Cocoa.
-    # Notice that calling this function will generate a {Wx::EVT_COMBOBOX_CLOSEUP} event except under {Wx::OSX} where generation of this event is not supported at all.
+    # Currently this method is implemented in wxMSW, wxGTK and wxOSX/Cocoa.
+    # Notice that calling this function will generate a {Wx::EVT_COMBOBOX_CLOSEUP} event except under wxOSX where generation of this event is not supported at all.
     # @return [void]
     def dismiss; end
     

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

@@ -25,7 +25,7 @@ module Wx
     # @param pos [Array(Integer, Integer), Wx::Point]  Button position. If {Wx::DEFAULT_POSITION} is specified then a default position is chosen.
     # @param size [Array(Integer, Integer), Wx::Size]  Button size. If {Wx::DEFAULT_SIZE} is specified then the button is sized appropriately for the question mark bitmap.
     # @param style [Integer]  Window style.
-    # @return [ContextHelpButton]
+    # @return [Wx::ContextHelpButton]
     def initialize(parent, id=Wx::StandardID::ID_CONTEXT_HELP, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=0) end
     
   end # ContextHelpButton
@@ -44,7 +44,8 @@ module Wx
   # 
   # There are a couple of ways to invoke this behaviour implicitly:
   # 
-  # - Use the {Wx::DIALOG_EX_CONTEXTHELP} style for a dialog (Windows only). This will put a question mark in the titlebar, and Windows will put the application into context-sensitive help mode automatically, with further programming.- 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).
+  # - Use the {Wx::DIALOG_EX_CONTEXTHELP} style for a dialog (Windows only). This will put a question mark in the titlebar, and Windows will put the application into context-sensitive help mode automatically, with further programming.
+  # - 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.
   # === 
@@ -61,7 +62,7 @@ module Wx
     # If window is NULL, the top window is used.
     # @param window [Wx::Window] 
     # @param doNow [true,false] 
-    # @return [ContextHelp]
+    # @return [Wx::ContextHelp]
     def initialize(window=nil, doNow=true) end
     
     # Puts the application into context-sensitive help mode.

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

@@ -12,8 +12,11 @@ module Wx
   # 
   # 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:
+  # 
   # - {Wx::EvtHandler#evt_text_copy}(id, meth = nil, &block): Some or all of the controls content was copied to the clipboard. 
+  # 
   # - {Wx::EvtHandler#evt_text_cut}(id, meth = nil, &block): Some or all of the controls content was cut (i.e. copied and deleted). 
+  # 
   # - {Wx::EvtHandler#evt_text_paste}(id, meth = nil, &block): Clipboard content was pasted into the control. 
   # 
   # === 
@@ -33,10 +36,10 @@ module Wx
     #   @param style [Integer]  Control style. For generic window styles, please see {Wx::Window}.
     #   @param validator [Wx::Validator]  Control validator.
     #   @param name [String]  Control name.
-    #   @return [Control]
+    #   @return [Wx::Control]
     # @overload initialize()
     #   Default constructor to allow 2-phase creation.
-    #   @return [Control]
+    #   @return [Wx::Control]
     def initialize(*args) end
     
     # @param parent [Wx::Window] 
@@ -83,7 +86,7 @@ module Wx
     #            postcode.get_text_extent("99999")))
     #   ```
     #   
-    #   Currently this method is only implemented for {Wx::TextCtrl}, {Wx::ComboBox} and {Wx::Choice} in {Wx::MSW} and {Wx::GTK}.
+    #   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.
@@ -135,7 +138,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 {Wx::GTK} 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> 
@@ -211,8 +214,8 @@ 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 ({Wx::MSW}, {Wx::GTK} and {Wx::OSX}/Cocoa) while {Wx::StaticText} supports it in {Wx::GTK} and {Wx::OSX} 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 {Wx::GTK} and {Wx::OSX} support multiline labels with markup, the generic implementation (also used in {Wx::MSW}) 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 [true,false]
     def set_label_markup(markup) end
     alias_method :label_markup=, :set_label_markup

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

@@ -7,10 +7,10 @@
 module Wx
 
   # wxRuby version string
-  Wx::WXRUBY_VERSION = '0.9.0-rc.2'
+  Wx::WXRUBY_VERSION = '0.9.0-rc.3'
 
   # wxRuby version release type (alpha, beta, rc)
-  Wx::WXRUBY_RELEASE_TYPE = 'rc.2'
+  Wx::WXRUBY_RELEASE_TYPE = 'rc.3'
   # wxRuby major version number
   Wx::WXRUBY_MAJOR = 0
   # wxRuby minor version number
@@ -33,6 +33,9 @@ module Wx
   # Integer constant reflecting the sub-release number of the wxWidgets release used to build wxRuby
   WXWIDGETS_SUBRELEASE_NUMBER = 1
 
+  # Integer constant reflecting the wxWidgets wxDEBUG_LEVEL
+  WXWIDGETS_DEBUG_LEVEL = 1
+
   # Boolean constant indicating if wxRuby was build in debug (true) or release (false) mode
   DEBUG = false
 

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

@@ -39,25 +39,30 @@ module Wx
   
     # @overload initialize()
     #   Default constructor.
-    #   @return [Cursor]
+    #   @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 {Wx::MSW} or {Wx::BitmapType::BITMAP_TYPE_XPM} under {Wx::GTK}).
+    #   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 [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.- under GTK, it defaults to {Wx::BitmapType::BITMAP_TYPE_XPM}. See the wxCursor(const wxImage& image) ctor for more info.- under X11, it defaults to {Wx::BitmapType::BITMAP_TYPE_XPM}.- under Motif, it defaults to {Wx::BitmapType::BITMAP_TYPE_XBM}.
+    #     
+    #     - 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.
+    #     - under GTK, it defaults to {Wx::BitmapType::BITMAP_TYPE_XPM}. See the wxCursor(const wxImage& image) ctor for more info.
+    #     - under X11, it defaults to {Wx::BitmapType::BITMAP_TYPE_XPM}.
+    #     - under Motif, it defaults to {Wx::BitmapType::BITMAP_TYPE_XBM}.
     #   @param hotSpotX [Integer]  Hotspot x coordinate (relative to the top left of the image).
     #   @param hotSpotY [Integer]  Hotspot y coordinate (relative to the top left of the image).
-    #   @return [Cursor]
+    #   @return [Wx::Cursor]
     # @overload initialize(cursorId)
     #   Constructs a cursor using a cursor identifier.
     #   @param cursorId [StockCursor]  A stock cursor identifier. See {Wx::StockCursor}.
-    #   @return [Cursor]
+    #   @return [Wx::Cursor]
     # @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 {Wx::MSW} the foreground will be white and the background black. If the cursor is larger than 32x32 it is resized.
-    #   In {Wx::GTK}, 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.
+    #   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 {Wx::Mac} (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
@@ -65,16 +70,16 @@ module Wx
     #     image.set_option(Wx::IMAGE_OPTION_CUR_HOTSPOT_X, hotSpotY)
     #   ```
     #   @param image [Wx::Image] 
-    #   @return [Cursor]
+    #   @return [Wx::Cursor]
     # @overload initialize(xpmData)
     #   Constructs a cursor from XPM data.
     #   In versions of wxWidgets until 3.1.6 constructing {Wx::Cursor} from XPM data implicitly used {Wx::Image} constructor from XPM data and {Wx::Cursor} constructor from {Wx::Image}. Since 3.1.6 this constructor overload is available to allow constructing {Wx::Cursor} from XPM to still work, even though {Wx::Image} constructor from XPM is now explicit.
     #   @param xpmData [char] 
-    #   @return [Cursor]
+    #   @return [Wx::Cursor]
     # @overload initialize(cursor)
     #   Copy constructor, uses reference counting.
     #   @param cursor [Wx::Cursor]  Pointer or reference to a cursor to copy.
-    #   @return [Cursor]
+    #   @return [Wx::Cursor]
     def initialize(*args) end
     
     # Returns true if cursor data is present.
@@ -84,7 +89,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 {Wx::MSW} and {Wx::GTK2}+ 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

@@ -49,11 +49,11 @@ module Wx
     # @overload initialize(format=Wx::DataFormatId::DF_INVALID)
     #   Constructs a data format object for one of the standard data formats or an empty data object (use {Wx::DataFormat#set_type} or {Wx::DataFormat#set_id} later in this case).
     #   @param format [DataFormatId] 
-    #   @return [DataFormat]
+    #   @return [Wx::DataFormat]
     # @overload initialize(format)
     #   Constructs a data format object for a custom format identified by its name format.
     #   @param format [String] 
-    #   @return [DataFormat]
+    #   @return [Wx::DataFormat]
     def initialize(*args) end
     
     # Returns the name of a custom format (this function will fail for a standard format).

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

@@ -19,9 +19,16 @@ module Wx
   # So, you have several solutions when you need a {Wx::DataObject} class (and you need one as soon as you want to transfer data via the clipboard or drag and drop):
   # 
   # - Use one of the built-in classes.
-  # - You may use {Wx::TextDataObject}, {Wx::BitmapDataObject} {Wx::FileDataObject}, {Wx::URLDataObject} in the simplest cases when you only need to support one format and your data is either text, bitmap or list of files.- Use {Wx::DataObjectSimple}
-  # - Deriving from {Wx::DataObjectSimple} is the simplest solution for custom data - you will only support one format and so probably won't be able to communicate with other programs, but data transfer will work in your program (or between different instances of it).- Use {Wx::DataObjectComposite}
-  # - This is a simple but powerful solution which allows you to support any number of formats (either standard or custom if you combine it with the previous solution).- Use {Wx::DataObject} directly
+  # 
+  # - You may use {Wx::TextDataObject}, {Wx::BitmapDataObject} {Wx::FileDataObject}, {Wx::URLDataObject} in the simplest cases when you only need to support one format and your data is either text, bitmap or list of files.
+  # - Use {Wx::DataObjectSimple}
+  # 
+  # - Deriving from {Wx::DataObjectSimple} is the simplest solution for custom data - you will only support one format and so probably won't be able to communicate with other programs, but data transfer will work in your program (or between different instances of it).
+  # - Use {Wx::DataObjectComposite}
+  # 
+  # - This is a simple but powerful solution which allows you to support any number of formats (either standard or custom if you combine it with the previous solution).
+  # - Use {Wx::DataObject} directly
+  # 
   # - This is the solution for maximum flexibility and efficiency, but it is also the most difficult to implement.
   # 
   # Please note that the easiest way to use drag and drop and the clipboard with multiple formats is by using {Wx::DataObjectComposite}, but it is not the most efficient one as each {Wx::DataObjectSimple} would contain the whole data in its respective formats. Now imagine that you want to paste 200 pages of text in your proprietary format, as well as Word, RTF, HTML, Unicode and plain text to the clipboard and even today's computers are in trouble. For this case, you will have to derive from {Wx::DataObject} directly and make it enumerate its formats and provide the data in the requested format on demand.
@@ -67,7 +74,7 @@ module Wx
     end # Direction
     
     # Constructor.
-    # @return [DataObject]
+    # @return [Wx::DataObject]
     def initialize; end
     
     # Copies all formats supported in the given direction dir to the array pointed to by formats.
@@ -80,7 +87,7 @@ module Wx
     # The method will write the data of the format format to the buffer buf.
     # In other words, copy the data from this object in the given format to the supplied buffer. Returns true on success, false on failure.
     # @param format [Wx::DataFormat] 
-    # @return [String]
+    # @return [Array(,String)]
     def get_data_here(format) end
     alias_method :data_here, :get_data_here
     
@@ -103,13 +110,13 @@ module Wx
     # true on success, false on failure.
     # @param format [Wx::DataFormat]  The format for which to set the data.
     # @param buf [String]  Non-NULL pointer to the data.
-    # @return [void]
+    # @return []
     def set_data(format, buf) end
     
     # Returns true if this format is supported.
     # @param format [Wx::DataFormat] 
     # @param dir [Direction] 
-    # @return [void]
+    # @return []
     def is_supported(format, dir=Wx::DataObjectSimpleBase::Direction::Get) end
     alias_method :supported?, :is_supported
     
@@ -119,7 +126,7 @@ module Wx
   
     # Constructor accepts the supported format (none by default) which may also be set later with {Wx::DataObjectSimple#set_format}.
     # @param format [Wx::DataFormat] 
-    # @return [DataObjectSimple]
+    # @return [Wx::DataObjectSimple]
     def initialize(format=Wx::FORMAT_INVALID) end
     
     # Returns the (one and only one) format supported by this object.
@@ -187,7 +194,7 @@ module Wx
   class DataObjectComposite < DataObject
   
     # The default constructor.
-    # @return [DataObjectComposite]
+    # @return [Wx::DataObjectComposite]
     def initialize; end
     
     # Adds the dataObject to the list of supported objects and it becomes the preferred object if preferred is true.
@@ -230,7 +237,7 @@ module Wx
   
     # Constructor, optionally passing a bitmap (otherwise use {Wx::BitmapDataObject#set_bitmap} later).
     # @param bitmap [Wx::Bitmap] 
-    # @return [BitmapDataObject]
+    # @return [Wx::BitmapDataObject]
     def initialize(bitmap=Wx::NULL_BITMAP) end
     
     # Returns the bitmap associated with the data object.
@@ -263,7 +270,7 @@ module Wx
   class FileDataObject < DataObjectSimple
   
     # Constructor.
-    # @return [FileDataObject]
+    # @return [Wx::FileDataObject]
     def initialize; end
     
     # Adds a file to the file list represented by this data object (Windows only).
@@ -295,7 +302,7 @@ module Wx
   
     # Constructor, may be used to initialise the text (otherwise {Wx::TextDataObject#set_text} should be used later).
     # @param text [String] 
-    # @return [TextDataObject]
+    # @return [Wx::TextDataObject]
     def initialize(text=('')) end
     
     # Returns the text associated with the data object.
@@ -334,7 +341,7 @@ module Wx
     # The constructor accepts a format argument which specifies the (single) format supported by this object.
     # If it isn't set here, {Wx::DataObjectSimple#set_format} should be used.
     # @param format [Wx::DataFormat] 
-    # @return [CustomDataObject]
+    # @return [Wx::CustomDataObject]
     def initialize(format=Wx::FORMAT_INVALID) end
     
   end # CustomDataObject
@@ -355,7 +362,7 @@ module Wx
   
     # Constructor, optionally passing an image (otherwise use {Wx::ImageDataObject#set_image} later).
     # @param image [Wx::Image] 
-    # @return [ImageDataObject]
+    # @return [Wx::ImageDataObject]
     def initialize(image=Wx::NULL_IMAGE) end
     
     # Returns the image associated with the data object.
@@ -378,7 +385,7 @@ module Wx
   #   Wx::Clipboard.open { |clip| clip.place(Wx::URLDataObject.new(url))
   # ```
   # 
-  # The actual base class of this class is not always {Wx::DataObject} itself, but rather either {Wx::DataObjectComposite} in {Wx::MSW} and {Wx::GTK} or {Wx::TextDataObject} in the other ports. Please don't rely on the exact base class, it is not guaranteed that it won't change in the future.
+  # The actual base class of this class is not always {Wx::DataObject} itself, but rather either {Wx::DataObjectComposite} in wxMSW and wxGTK or {Wx::TextDataObject} in the other ports. Please don't rely on the exact base class, it is not guaranteed that it won't change in the future.
   # 
   # === 
   # 
@@ -392,7 +399,7 @@ module Wx
     # Constructor, may be used to initialize the URL.
     # If url is empty, {Wx::URLDataObject#set_url} can be used later.
     # @param url [String] 
-    # @return [URLDataObject]
+    # @return [Wx::URLDataObject]
     def initialize(url=('')) end
     
     # Returns the URL stored by this object, as a string.

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

@@ -23,12 +23,12 @@ module Wx
   class DateEvent < CommandEvent
   
     # @overload initialize()
-    #   @return [DateEvent]
+    #   @return [Wx::DateEvent]
     # @overload initialize(win, dt, type)
     #   @param win [Wx::Window] 
     #   @param dt [Time,Date,DateTime] 
-    #   @param type [Integer] 
-    #   @return [DateEvent]
+    #   @param type [Wx::AUI::AuiMDIChildFrame::EventType] 
+    #   @return [Wx::DateEvent]
     def initialize(*args) end
     
     # Returns the date.

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

@@ -32,11 +32,15 @@ module Wx
   # === Styles
   # 
   # This class supports the following styles:
-  #  
+  # 
   # - {Wx::DP_SPIN}: Creates a control without a month calendar drop down but with spin-control-like arrows to change individual date components. This style is not supported by the generic version. 
+  # 
   # - {Wx::DP_DROPDOWN}: Creates a control with a month calendar drop-down part from which the user can select a date. This style is not supported in OSX/Cocoa native version. 
+  # 
   # - {Wx::DP_DEFAULT}: Creates a control with the style that is best supported for the current platform (currently {Wx::DP_SPIN} under Windows and OSX/Cocoa and {Wx::DP_DROPDOWN} elsewhere). 
+  # 
   # - {Wx::DP_ALLOWNONE}: With this style, the control allows the user to not enter any valid date at all. Without it - the default - the control always has some valid date. This style is not supported in OSX/Cocoa native version. 
+  # 
   # - {Wx::DP_SHOWCENTURY}: Forces display of the century in the default date format. Without this style the century could be displayed, or not, depending on the default date representation in the system. This style is not supported in OSX/Cocoa native version currently. 
   # 
   # As can be seen from the remarks above, most of the control style are only supported in the native MSW implementation. In portable code it's recommended to use {Wx::DP_DEFAULT} style only, possibly combined with {Wx::DP_SHOWCENTURY} (this is also the style used by default if none is specified).
@@ -44,13 +48,14 @@ module Wx
   # 
   # The following event-handler methods redirect the events to member method or handler blocks for {Wx::DateEvent} events.
   # Event handler methods for events emitted by this class:
+  # 
   # - {Wx::EvtHandler#evt_date_changed}(id, meth = nil, &block): Process a {Wx::EVT_DATE_CHANGED} event, which fires when the user changes the current selection in the control. 
   # 
   # === 
   # 
-  # Category:  Picker 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:  Picker 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::TimePickerCtrl
   # @see  Wx::CalendarCtrl
@@ -61,7 +66,7 @@ module Wx
   
     # @overload initialize()
     #   Default constructor.
-    #   @return [DatePickerCtrl]
+    #   @return [Wx::DatePickerCtrl]
     # @overload initialize(parent, id, dt=Wx::DefaultDateTime, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=(Wx::DP_DEFAULT|Wx::DP_SHOWCENTURY), validator=Wx::DEFAULT_VALIDATOR, name=("datectrl"))
     #   Initializes the object and calls {Wx::DatePickerCtrl#create} with all the parameters.
     #   @param parent [Wx::Window] 
@@ -72,7 +77,7 @@ module Wx
     #   @param style [Integer] 
     #   @param validator [Wx::Validator] 
     #   @param name [String] 
-    #   @return [DatePickerCtrl]
+    #   @return [Wx::DatePickerCtrl]
     def initialize(*args) end
     
     # Create the control window.

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

@@ -10,8 +10,13 @@ module Wx
   # 
   # {Wx::DC#blit} and {Wx::DC#stretch_blit}).
   # The description of the values below refer to how a generic src source pixel and the corresponding dst destination pixel gets combined together to produce the final pixel. E.g. {Wx::RasterOperationMode::CLEAR} and {Wx::RasterOperationMode::SET} completely ignore the source and the destination pixel and always put zeroes or ones in the final surface.
-  # Note that not all modes are supported under all platforms. Notably {Wx::GTK3} and {Wx::Mac} only support the following modes:
-  # - {Wx::RasterOperationMode::COPY}- {Wx::RasterOperationMode::OR}- {Wx::RasterOperationMode::NO_OP}- {Wx::RasterOperationMode::CLEAR}- {Wx::RasterOperationMode::XOR} and only support the commonly used {Wx::RasterOperationMode::INVERT} when the source colour is white (as it is implemented using {Wx::CompositionMode::COMPOSITION_DIFF} composition mode).
+  # Note that not all modes are supported under all platforms. Notably wxGTK3 and {Wx::Mac} only support the following modes:
+  # 
+  # - {Wx::RasterOperationMode::COPY}
+  # - {Wx::RasterOperationMode::OR}
+  # - {Wx::RasterOperationMode::NO_OP}
+  # - {Wx::RasterOperationMode::CLEAR}
+  # - {Wx::RasterOperationMode::XOR} and only support the commonly used {Wx::RasterOperationMode::INVERT} when the source colour is white (as it is implemented using {Wx::CompositionMode::COMPOSITION_DIFF} composition mode).
   # 
   class RasterOperationMode < Wx::Enum
   
@@ -599,14 +604,15 @@ module Wx
     
     # @overload flood_fill(x, y, colour, style=Wx::FloodFillStyle::FLOOD_SURFACE)
     #   Flood fills the device context starting from the given point, using the current brush colour, and using a style:
-    #   - {Wx::FloodFillStyle::FLOOD_SURFACE}: The flooding occurs until a colour other than the given colour is encountered.- {Wx::FloodFillStyle::FLOOD_BORDER}: The area to be flooded is bounded by the given colour.
+    #   - {Wx::FloodFillStyle::FLOOD_SURFACE}: The flooding occurs until a colour other than the given colour is encountered.
+    #   - {Wx::FloodFillStyle::FLOOD_BORDER}: The area to be flooded is bounded by the given colour.
     #   
-    #   Currently this method is not implemented in {Wx::OSX} and does nothing there.
+    #   Currently this method is not implemented in wxOSX and does nothing there.
     #   false if the operation failed.
     #   
     #   The present implementation for non-Windows platforms may fail to find colour borders if the pixels do not match the colour exactly. However the function will still return true.
     #   
-    #   This method shouldn't be used with {Wx::PaintDC} under non-Windows platforms as it uses {Wx::DC#get_pixel} internally and this may give wrong results, notably in {Wx::GTK}. If you need to flood fill {Wx::PaintDC}, create a temporary {Wx::MemoryDC}, flood fill it and then blit it to, or draw as a bitmap on, {Wx::PaintDC}. See the example of doing this in the drawing sample and {Wx::BufferedPaintDC} class.
+    #   This method shouldn't be used with {Wx::PaintDC} under non-Windows platforms as it uses {Wx::DC#get_pixel} internally and this may give wrong results, notably in wxGTK. If you need to flood fill {Wx::PaintDC}, create a temporary {Wx::MemoryDC}, flood fill it and then blit it to, or draw as a bitmap on, {Wx::PaintDC}. See the example of doing this in the drawing sample and {Wx::BufferedPaintDC} class.
     #   @param x [Integer] 
     #   @param y [Integer] 
     #   @param colour [Wx::Colour,String,Symbol] 
@@ -658,7 +664,10 @@ module Wx
     #   Sets the clipping region for this device context to the intersection of the given region described by the parameters of this method and the previously set clipping region.
     #   The clipping region is an area to which drawing is restricted. Possible uses for the clipping region are for clipping text or for speeding up window redraws when only a known area of the screen is damaged.
     #   
-    #   - Clipping region should be given in logical coordinates.- Calling this function can only make the clipping region smaller, never larger.- You need to call {Wx::DC#destroy_clipping_region} first if you want to set the clipping region exactly to the region specified.- If resulting clipping region is empty, then all drawing on the DC is clipped out (all changes made by drawing operations are masked out).
+    #   - Clipping region should be given in logical coordinates.
+    #   - Calling this function can only make the clipping region smaller, never larger.
+    #   - You need to call {Wx::DC#destroy_clipping_region} first if you want to set the clipping region exactly to the region specified.
+    #   - If resulting clipping region is empty, then all drawing on the DC is clipped out (all changes made by drawing operations are masked out).
     #   @see Wx::DC#destroy_clipping_region
     #   @see  Wx::Region 
     #   @param x [Integer] 
@@ -697,7 +706,7 @@ module Wx
     
     # Returns the various font characteristics.
     # This method allows retrieving some of the font characteristics not returned by {Wx::DC#get_text_extent}, notably internal leading and average character width.
-    # Currently this method returns correct results only under {Wx::MSW}, in the other ports the internal leading will always be 0 and the average character width will be computed as the width of the character 'x'.
+    # Currently this method returns correct results only under wxMSW, in the other ports the internal leading will always be 0 and the average character width will be computed as the width of the character 'x'.
     # @return [Wx::FontMetrics]
     def get_font_metrics; end
     alias_method :font_metrics, :get_font_metrics
@@ -797,7 +806,7 @@ module Wx
     alias_method :background_mode=, :set_background_mode
     
     # Sets the current font for the DC.
-    # The font parameter should be valid, although in {Wx::MSW} port (only) the argument {Wx::NULL_FONT} is also accepted and resets the device context font to the default value used by the system (which is not generally useful).
+    # The font parameter should be valid, although in wxMSW port (only) the argument {Wx::NULL_FONT} is also accepted and resets the device context font to the default value used by the system (which is not generally useful).
     # @see Wx::Font 
     # @param font [Wx::Font,Wx::FontInfo] 
     # @return [void]
@@ -892,16 +901,22 @@ module Wx
     # @param ysrc [Integer]  Source device context y position.
     # @param logicalFunc [RasterOperationMode]  Logical function to use, see {Wx::DC#set_logical_function}.
     # @param useMask [true,false]  If true, Blit does a transparent blit using the mask that is associated with the bitmap selected into the source device context. The Windows implementation does the following if MaskBlt cannot be used: 
+    #   
     #   - 
     #   Creates a temporary bitmap and copies the destination area into it. 
+    #   
     #   - 
     #   Copies the source area into the temporary bitmap using the specified logical function. 
+    #   
     #   - 
     #   Sets the masked area in the temporary bitmap to BLACK by ANDing the mask bitmap with the temp bitmap with the foreground colour set to WHITE and the bg colour set to BLACK. 
+    #   
     #   - 
     #   Sets the unmasked area in the destination area to BLACK by ANDing the mask bitmap with the destination area with the foreground colour set to BLACK and the background colour set to WHITE. 
+    #   
     #   - 
     #   ORs the temporary bitmap with the destination area. 
+    #   
     #   - 
     #   Deletes the temporary bitmap. 
     #   
@@ -934,16 +949,22 @@ module Wx
     # @param srcHeight [Integer]  Height of source area to be copied.
     # @param logicalFunc [RasterOperationMode]  Logical function to use, see {Wx::DC#set_logical_function}.
     # @param useMask [true,false]  If true, Blit does a transparent blit using the mask that is associated with the bitmap selected into the source device context. The Windows implementation does the following if MaskBlt cannot be used: 
+    #   
     #   - 
     #   Creates a temporary bitmap and copies the destination area into it. 
+    #   
     #   - 
     #   Copies the source area into the temporary bitmap using the specified logical function. 
+    #   
     #   - 
     #   Sets the masked area in the temporary bitmap to BLACK by ANDing the mask bitmap with the temp bitmap with the foreground colour set to WHITE and the bg colour set to BLACK. 
+    #   
     #   - 
     #   Sets the unmasked area in the destination area to BLACK by ANDing the mask bitmap with the destination area with the foreground colour set to BLACK and the background colour set to WHITE. 
+    #   
     #   - 
     #   ORs the temporary bitmap with the destination area. 
+    #   
     #   - 
     #   Deletes the temporary bitmap. 
     #   
@@ -1041,7 +1062,11 @@ module Wx
     
     # Copy attributes from another DC.
     # The copied attributes currently are:
-    # - Font- Text foreground and background colours- Background brush- Layout direction
+    # 
+    # - Font
+    # - Text foreground and background colours
+    # - Background brush
+    # - Layout direction
     # 
     # Note that the scaling factor is not considered to be an attribute of {Wx::DC} and is not copied by this function.
     # @param dc [Wx::DC]  A valid (i.e. its {Wx::DC#is_ok} must return true) source device context.
@@ -1083,10 +1108,10 @@ module Wx
     alias_method :map_mode, :get_map_mode
     
     # Gets in colour the colour at the specified location.
-    # This method isn't available for {Wx::PRT::PostScriptDC} or {Wx::MetafileDC} nor for any DC in {Wx::OSX} port and simply returns false there.
+    # This method isn't available for {Wx::PRT::PostScriptDC} or {Wx::MetafileDC} nor for any DC in wxOSX port and simply returns false there.
     # Setting a pixel can be done using {Wx::DC#draw_point}.
     # 
-    # This method shouldn't be used with {Wx::PaintDC} as accessing the DC while drawing can result in unexpected results, notably in {Wx::GTK}.
+    # This method shouldn't be used with {Wx::PaintDC} as accessing the DC while drawing can result in unexpected results, notably in wxGTK.
     # @param x [Integer] 
     # @param y [Integer] 
     # @param colour [Wx::Colour] 
@@ -1189,7 +1214,7 @@ module Wx
     def set_device_origin(x, y) end
     
     # Sets the current logical function for the device context.
-    # This function is not fully supported in all ports, due to the limitations of the underlying drawing model. Notably, {Wx::RasterOperationMode::INVERT} which was commonly used for drawing rubber bands or other moving outlines in the past, is not, and will not, be supported by {Wx::GTK3} and {Wx::Mac}. The suggested alternative is to draw temporarily objects normally and refresh the (affected part of the) window to remove them later.
+    # This function is not fully supported in all ports, due to the limitations of the underlying drawing model. Notably, {Wx::RasterOperationMode::INVERT} which was commonly used for drawing rubber bands or other moving outlines in the past, is not, and will not, be supported by wxGTK3 and {Wx::Mac}. The suggested alternative is to draw temporarily objects normally and refresh the (affected part of the) window to remove them later.
     # 
     # It determines how a source pixel (from a pen or brush colour, or source device context if using {Wx::DC#blit}) combines with a destination pixel in the current device context. Text drawing is not affected by this function.
     # See {Wx::RasterOperationMode} enumeration values for more info.