wxruby3 0.9.0.pre.beta.11-x64-mingw-ucrt → 0.9.0.pre.beta.13-x64-mingw-ucrt

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

@@ -65,7 +65,7 @@ module Wx
     # @overload initialize()
     #   Default constructor, you must call {Wx::VScrolledWindow#create} later.
     #   @return [VScrolledWindow]
-    # @overload initialize(parent, id=Wx::ID_ANY, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=0, name=Wx::PANEL_NAME_STR)
+    # @overload initialize(parent, id=Wx::StandardID::ID_ANY, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=0, name=Wx::PanelNameStr)
     #   This is the normal constructor, no need to call {Wx::VScrolledWindow#create} after using this constructor.
     #   {Wx::VSCROLL} is always automatically added to the style, there is no need to specify it explicitly.
     #   @param parent [Wx::Window]  The parent window, must not be NULL.
@@ -86,7 +86,7 @@ module Wx
     # @param style [Integer] 
     # @param name [String] 
     # @return [true,false]
-    def create(parent, id=Wx::ID_ANY, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=0, name=Wx::PANEL_NAME_STR) end
+    def create(parent, id=Wx::StandardID::ID_ANY, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=0, name=Wx::PanelNameStr) end
     
     # Returns the number of rows the target window contains.
     # 

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

@@ -183,7 +183,7 @@ module Wx
     # @overload initialize()
     #   Default constructor.
     #   @return [Variant]
-    # @overload initialize(data, name=Wx::EMPTY_STRING)
+    # @overload initialize(data, name=(''))
     #   Constructs a variant directly with a {Wx::VariantData} object.
     #   {Wx::Variant} will take ownership of the {Wx::VariantData} and will not increase its reference count.
     #   @param data [Object] 
@@ -193,47 +193,47 @@ module Wx
     #   Constructs a variant from another variant by increasing the reference count.
     #   @param variant [nil,String,Integer,Float,Time,Wx::Font,Wx::Colour,Wx::Variant,Array<WxVariant>,Array<String>,ObjectWx::PG::ColourPropertyValue] 
     #   @return [Variant]
-    # @overload initialize(value, name=Wx::EMPTY_STRING)
+    # @overload initialize(value, name=(''))
     #   Constructs a variant from a string.
     #   @param value [String] 
     #   @param name [String] 
     #   @return [Variant]
-    # @overload initialize(value, name=Wx::EMPTY_STRING)
+    # @overload initialize(value, name=(''))
     #   Constructs a variant from a long.
     #   @param value [Integer] 
     #   @param name [String] 
     #   @return [Variant]
-    # @overload initialize(value, name=Wx::EMPTY_STRING)
+    # @overload initialize(value, name=(''))
     #   Constructs a variant from a bool.
     #   @param value [true,false] 
     #   @param name [String] 
     #   @return [Variant]
-    # @overload initialize(value, name=Wx::EMPTY_STRING)
+    # @overload initialize(value, name=(''))
     #   Constructs a variant from a double.
     #   @param value [Float] 
     #   @param name [String] 
     #   @return [Variant]
-    # @overload initialize(value, name=Wx::EMPTY_STRING)
+    # @overload initialize(value, name=(''))
     #   Constructs a variant from a {Wx::LongLong}.
     #   @param value [Integer] 
     #   @param name [String] 
     #   @return [Variant]
-    # @overload initialize(value, name=Wx::EMPTY_STRING)
+    # @overload initialize(value, name=(''))
     #   Constructs a variant from a {Wx::ULongLong}.
     #   @param value [Integer] 
     #   @param name [String] 
     #   @return [Variant]
-    # @overload initialize(value, name=Wx::EMPTY_STRING)
+    # @overload initialize(value, name=(''))
     #   Constructs a variant from a list of variants.
     #   @param value [Array<Wx::Variant>] 
     #   @param name [String] 
     #   @return [Variant]
-    # @overload initialize(val, name=Wx::EMPTY_STRING)
+    # @overload initialize(val, name=(''))
     #   Constructs a variant from a {Wx::DateTime}.
     #   @param val [Time,Date,DateTime] 
     #   @param name [String] 
     #   @return [Variant]
-    # @overload initialize(val, name=Wx::EMPTY_STRING)
+    # @overload initialize(val, name=(''))
     #   Constructs a variant from a {Wx::ArrayString}.
     #   @param val [Array<String>] 
     #   @param name [String] 

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

@@ -127,27 +127,22 @@ module Wx
   end # WindowVariant
   
   # Find the deepest window at the mouse pointer position, returning the window and current pointer position in screen coordinates.
-  # Include file: #include <wx/window.h>
   # @param pt [Array(Integer, Integer), Wx::Point] 
   # @return [Wx::Window]
   def self.find_window_at_pointer(pt) end
   
   # Gets the currently active window (implemented for MSW and GTK only currently, always returns NULL in the other ports).
-  # Include file: #include <wx/window.h>
   # @return [Wx::Window]
   def self.get_active_window; end
   
   # Returns the first top level parent of the given window, or in other words, the frame or dialog containing it, or NULL.
   # Notice that if window is itself already a TLW, it is returned directly.
-  # Include file: #include <wx/window.h>
   # @param window [Wx::Window] 
   # @return [Wx::Window]
   def self.get_top_level_parent(window) end
   
   # Return a string with human-readable platform-specific description of the window useful for diagnostic purposes.
   # The string returned from this function doesn't have any fixed form and can vary between different wxWidgets ports and versions, but contains some useful description of the window and uniquely identifies it. This can be useful to include in debug or tracing messages.
-  # 
-  # Include file: #include <wx/window.h>
   # @param window [Wx::Window]  Window pointer which is allowed to be NULL.
   # @return [String]
   def self.dump_window(window) end
@@ -1015,19 +1010,19 @@ module Wx
     # A synonym for {Wx::Window#centre}.
     # @param dir [Integer] 
     # @return [void]
-    def center(dir=Wx::BOTH) end
+    def center(dir=Wx::Orientation::BOTH) end
     
     # A synonym for {Wx::Window#centre_on_parent}.
     # @param dir [Integer] 
     # @return [void]
-    def center_on_parent(dir=Wx::BOTH) end
+    def center_on_parent(dir=Wx::Orientation::BOTH) end
     
     # Centres the window.
     # If the window is a top level one (i.e. doesn't have a parent), it will be centred relative to the screen anyhow.
     # @see Wx::Window#center 
     # @param direction [Integer]  Specifies the direction for the centring. May be {Wx::Orientation::HORIZONTAL}, {Wx::Orientation::VERTICAL} or {Wx::Orientation::BOTH}. It may also include the {Wx::CENTRE_ON_SCREEN} flag if you want to centre the window on the entire screen and not on its parent window.
     # @return [void]
-    def centre(direction=Wx::BOTH) end
+    def centre(direction=Wx::Orientation::BOTH) end
     
     # Centres the window on its parent.
     # This is a more readable synonym for {Wx::Window#centre}.
@@ -1036,7 +1031,7 @@ module Wx
     # @see Wx::TopLevelWindow#centre_on_screen 
     # @param direction [Integer]  Specifies the direction for the centring. May be {Wx::Orientation::HORIZONTAL}, {Wx::Orientation::VERTICAL} or {Wx::Orientation::BOTH}.
     # @return [void]
-    def centre_on_parent(direction=Wx::BOTH) end
+    def centre_on_parent(direction=Wx::Orientation::BOTH) end
     
     # This gets the position of the window in pixels, relative to the parent window for the child windows or relative to the display origin for the top level windows.
     # 
@@ -1246,7 +1241,7 @@ module Wx
     # Should only be called within a {Wx::PaintEvent} handler.
     # @see Wx::Region
     # @see  Wx::RegionIterator 
-    # @return [void]
+    # @return [Wx::Region]
     def get_update_region; end
     alias_method :update_region, :get_update_region
     
@@ -2269,7 +2264,7 @@ module Wx
     # @see  Wx::Window#on_internal_idle 
     # @param flags [Integer] 
     # @return [void]
-    def update_window_ui(flags=Wx::UPDATE_UI_NONE) end
+    def update_window_ui(flags=Wx::UpdateUI::UPDATE_UI_NONE) end
     
     # Returns the default font and colours which are used by the control.
     # This is useful if you want to use the same font or colour in your own control as in a standard control  which is a much better idea than hard coding specific colours or fonts which might look completely out of place on the users system, especially if it uses themes.
@@ -2279,7 +2274,7 @@ module Wx
     # @see Wx::Window#inherit_attributes 
     # @param variant [WindowVariant] 
     # @return [Wx::VisualAttributes]
-    def self.get_class_default_attributes(variant=Wx::WINDOW_VARIANT_NORMAL) end
+    def self.get_class_default_attributes(variant=Wx::WindowVariant::WINDOW_VARIANT_NORMAL) end
     
     # Finds the window or control which currently has the keyboard focus.
     # Note that this is a static function, so it can be called without needing a {Wx::Window} pointer.
@@ -2354,7 +2349,7 @@ module Wx
     # @overload initialize()
     #   Default constructor.
     #   @return [Window]
-    # @overload initialize(parent, id, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=0, name=Wx::PANEL_NAME_STR)
+    # @overload initialize(parent, id, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=0, name=Wx::PanelNameStr)
     #   Constructs a window, which can be a child of a frame, dialog or any other non-control window.
     #   @param parent [Wx::Window]  Pointer to a parent window.
     #   @param id [Integer]  Window identifier. If {Wx::StandardID::ID_ANY}, will automatically create an identifier. See Window IDs for more information about IDs.
@@ -2406,7 +2401,7 @@ module Wx
     # @param style [Integer] 
     # @param name [String] 
     # @return [true,false]
-    def create(parent, id, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=0, name=Wx::PANEL_NAME_STR) end
+    def create(parent, id, pos=Wx::DEFAULT_POSITION, size=Wx::DEFAULT_SIZE, style=0, name=Wx::PanelNameStr) end
     
   end # Window
   

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

@@ -49,7 +49,7 @@ module Wx
     #   Default constructor.
     #   Use this if you wish to derive from {Wx::Wizard} and then call {Wx::Wizard#create}, for example if you wish to set an extra style with {Wx::Window#set_extra_style} between the two calls.
     #   @return [Wizard]
-    # @overload initialize(parent, id=Wx::ID_ANY, title=Wx::EMPTY_STRING, bitmap=(Wx::BitmapBundle.new()), pos=Wx::DEFAULT_POSITION, style=Wx::DEFAULT_DIALOG_STYLE)
+    # @overload initialize(parent, id=Wx::StandardID::ID_ANY, title=(''), bitmap=(Wx::BitmapBundle.new()), pos=Wx::DEFAULT_POSITION, style=Wx::DEFAULT_DIALOG_STYLE)
     #   Constructor which really creates the wizard  if you use this constructor, you shouldn't call {Wx::Wizard#create}.
     #   Notice that unlike almost all other wxWidgets classes, there is no size parameter in the {Wx::Wizard} constructor because the wizard will have a predefined default size by default. If you want to change this, you should use the {Wx::Wizard#get_page_area_sizer} function.
     #   @param parent [Wx::Window]  The parent window, may be NULL.
@@ -71,7 +71,7 @@ module Wx
     # @param pos [Array(Integer, Integer), Wx::Point]  The position of the dialog, it will be centered on the screen by default.
     # @param style [Integer]  Window style is passed to {Wx::Dialog}.
     # @return [true,false]
-    def create(parent, id=Wx::ID_ANY, title=Wx::EMPTY_STRING, bitmap=(Wx::BitmapBundle.new()), pos=Wx::DEFAULT_POSITION, style=Wx::DEFAULT_DIALOG_STYLE) end
+    def create(parent, id=Wx::StandardID::ID_ANY, title=(''), bitmap=(Wx::BitmapBundle.new()), pos=Wx::DEFAULT_POSITION, style=Wx::DEFAULT_DIALOG_STYLE) end
     
     # This method is obsolete, use {Wx::Wizard#get_page_area_sizer} instead.
     # Sets the page size to be big enough for all the pages accessible via the given firstPage, i.e. this page, its next page and so on.

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

@@ -87,7 +87,7 @@ module Wx
     # @param direction [true,false] 
     # @param page [Wx::WizardPage] 
     # @return [WizardEvent]
-    def initialize(type=Wx::EVT_NULL, id=Wx::ID_ANY, direction=true, page=0) end
+    def initialize(type=Wx::EVT_NULL, id=Wx::StandardID::ID_ANY, direction=true, page=0) end
     
     # Return the direction in which the page is changing: for EVT_WIZARD_PAGE_CHANGING, return true if we're going forward or false otherwise and for EVT_WIZARD_PAGE_CHANGED return true if we came from the previous page and false if we returned from the next one.
     # @return [true,false]

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

@@ -106,7 +106,7 @@ module Wx
   # 
   class XmlNode < ::Object
   
-    # @overload initialize(type, name, content=Wx::EMPTY_STRING, lineNo=-1)
+    # @overload initialize(type, name, content=(''), lineNo=-1)
     #   A simplified version of the first constructor form, assuming a NULL parent.
     #   @param type [XmlNodeType]  One of the {Wx::XmlNodeType} enumeration value.
     #   @param name [String]  The name of the node. This is the string which appears between angular brackets.
@@ -145,7 +145,7 @@ module Wx
     # @param attrName [String] 
     # @param defaultVal [String] 
     # @return [String]
-    def get_attribute(attrName, defaultVal=Wx::EMPTY_STRING) end
+    def get_attribute(attrName, defaultVal=('')) end
     alias_method :attribute, :get_attribute
     
     # Returns the first child of this node.

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

@@ -43,13 +43,13 @@ module Wx
   # 
   class XmlResource < Object
   
-    # @overload initialize(filemask, flags=Wx::XRC_USE_LOCALE, domain=Wx::EMPTY_STRING)
+    # @overload initialize(filemask, flags=Wx::XmlResourceFlags::XRC_USE_LOCALE, domain=(''))
     #   Constructor.
     #   @param filemask [String]  The XRC file, archive file, or wildcard specification that will be used to load all resource files inside a zip archive.
     #   @param flags [Integer]  One or more value of the {Wx::XmlResourceFlags} enumeration.
     #   @param domain [String]  The name of the gettext catalog to search for translatable strings. By default all loaded catalogs will be searched. This provides a way to allow the strings to only come from a specific catalog.
     #   @return [XmlResource]
-    # @overload initialize(flags=Wx::XRC_USE_LOCALE, domain=Wx::EMPTY_STRING)
+    # @overload initialize(flags=Wx::XmlResourceFlags::XRC_USE_LOCALE, domain=(''))
     #   Constructor.
     #   @param flags [Integer]  One or more value of the {Wx::XmlResourceFlags} enumeration.
     #   @param domain [String]  The name of the gettext catalog to search for translatable strings. By default all loaded catalogs will be searched. This provides a way to allow the strings to only come from a specific catalog.
@@ -291,7 +291,7 @@ module Wx
     # @param str_id [String] 
     # @param value_if_not_found [Integer] 
     # @return [Integer]
-    def self.get_xrcid(str_id, value_if_not_found=Wx::ID_NONE) end
+    def self.get_xrcid(str_id, value_if_not_found=Wx::StandardID::ID_NONE) end
     
     # Sets the global resources object and returns a pointer to the previous one (may be NULL).
     # @param res [Wx::XmlResource] 

data/lib/wx/doc/graphics_context.rb

@@ -0,0 +1,42 @@
+
+class Wx::GraphicsContext
+
+  # @overload self.draw_on(window)
+  #   Creates a {Wx::GraphicsContext} from a {Wx::Window} and passes that object to the given block.
+  #   Deletes the gc object after the block returns.
+  #   @see Wx::GraphicsRenderer#create_context
+  #   @param window [Wx::Window]
+  #   @return [Wx::GraphicsContext]
+  # @overload self.draw_on(windowDC)
+  #   Creates a {Wx::GraphicsContext} from a {Wx::WindowDC} and passes that object to the given block.
+  #   Deletes the gc object after the block returns.
+  #   @see Wx::GraphicsRenderer#create_context
+  #   @param windowDC [Wx::WindowDC]
+  #   @return [Wx::GraphicsContext]
+  # @overload self.draw_on(memoryDC)
+  #   Creates a {Wx::GraphicsContext} from a {Wx::MemoryDC} and passes that object to the given block.
+  #   Deletes the gc object after the block returns.
+  #   @see Wx::GraphicsRenderer#create_context
+  #   @param memoryDC [Wx::MemoryDC]
+  #   @return [Wx::GraphicsContext]
+  # @overload self.draw_on(printerDC)
+  #   Creates a {Wx::GraphicsContext} from a {Wx::PrinterDC} and passes that object to the given block.
+  #   Deletes the gc object after the block returns.
+  #   Under GTK+, this will only work when using the GtkPrint printing backend which is available since GTK+ 2.10.
+  #   @see Wx::GraphicsRenderer#create_context
+  #   @see  Printing Under Unix (GTK+)
+  #   @param printerDC [Wx::PrinterDC]
+  #   @return [Wx::GraphicsContext]
+  # @overload self.draw_on(image)
+  #   Creates a {Wx::GraphicsContext} associated with a {Wx::Image} and passes that object to the given block.
+  #   Deletes the gc object after the block returns.
+  #   The image specifies the size of the context as well as whether alpha is supported (if {Wx::Image#has_alpha}) or not and the initial contents of the context. The image object must have a life time greater than that of the new context as the context copies its contents back to the image when it is destroyed.
+  #   @param image [Wx::Image]
+  #   @return [Wx::GraphicsContext]
+  # @overload self.draw_on()
+  #   Create a lightweight context that can be used only for measuring text and passes that object to the given block.
+  #   Deletes the gc object after the block returns.
+  #   @return [Wx::GraphicsContext]
+  def self.draw_on(*args) end
+
+end

data/lib/wx/doc/icon.rb

@@ -0,0 +1,18 @@
+
+class Wx::Icon
+
+  # Searches for an art file with basename 'name' and creates an Icon if found.
+  # Raises an ArgumentError if not found.
+  # Wx::ArtLocator::find_art is used to look up the art file using ::Kernel#caller_locations to
+  # determine the values for the 'art_path' and 'art_owner' arguments ('art_path' is set to the
+  # absolute path to the folder holding the caller's code and 'art_owner' to the basename of the
+  # caller's source file). The 'art_type' argument is set to <code>:icon</code>.
+  # @param [String,Symbol] name base name of art file
+  # @param [Wx::BitmapType,nil] bmp_type bitmap type for art file (nil means any supported type)
+  # @param [Integer] desired_width
+  # @param [Integer] desired_height
+  # @return [Wx::Icon]
+  # @see Wx::ArtLocator::find_art
+  def self.Icon(name, bmp_type = nil, desired_width=-1, desired_height=-1); end
+
+end

data/lib/wx/doc/id_helper.rb

@@ -0,0 +1,25 @@
+
+module Wx
+
+  # Mixin module to provide convenience method for defining Windows/Control ids.
+  # @example Define an ID module
+  #   module MyIDS
+  #     include Wx::IDHelper
+  #     # by default the offset for the next id is Wx::ID_HIGHEST which makes 'Wx::ID_HIGHEST+1'
+  #     # the first id value returned.
+  #     MY_FIRST_ID = self.next_id
+  #     MY_SECOND_ID = self.next_id   # MY_SECOND_ID will have value Wx::ID_HIGHEST+2
+  #
+  #     # optionally a user defined offset can be specified like this:
+  #     MY_OTHER_ID = self.next_id(MY_FIRST_ID+1000)  # MY_OTHER_ID will have value MY_FIRST_ID+1001
+  #     MY_OTHER_ID2 = self.next_id                   # MY_OTHER_ID2 will have value MY_FIRST_ID+1002
+  #   end
+  #
+  module IDHelper
+
+    # Provides the singleton method #next_id to the including module.
+    def self.included(base) end
+
+  end
+
+end

data/lib/wx/doc/image.rb

@@ -0,0 +1,33 @@
+
+module Wx
+
+  class Image
+
+    # Returns an array of BitmapTypes identifying the available image handlers.
+    # @return [Array<Wx::BitmapType>]
+    def self.handlers; end
+
+    # Returns an array with the supported file extensions (as 'bmp') of the available image handlers.
+    # @return [Array<String>]
+    def self.extensions; end
+
+    # returns a Hash with all supported extensions per available BitmapType
+    # @return [Hash]
+    def self.handler_extensions; end
+
+    # Searches for an art file with basename 'name' and creates an Image if found.
+    # Raises an ArgumentError if not found.
+    # Wx::ArtLocator::find_art is used to look up the art file using ::Kernel#caller_locations to
+    # determine the values for the 'art_path' and 'art_owner' arguments ('art_path' is set to the
+    # absolute path to the folder holding the caller's code and 'art_owner' to the basename of the
+    # caller's source file). The 'art_type' argument is set to <code>:icon</code>.
+    # @param [String,Symbol] name base name of art file
+    # @param [Wx::BitmapType,nil] bmp_type bitmap type for art file (nil means any supported type)
+    # @param [Integer] index  Index of the image to load in the case that the image file contains multiple images. This is only used by GIF, ICO and TIFF handlers. The default value (-1) means "choose the default image" and is interpreted as the first image (index=0) by the GIF and TIFF handler and as the largest and most colourful one by the ICO handler.
+    # @return [Wx::Image]
+    # @see Wx::ArtLocator::find_art
+    def self.Image(name, bmp_type = nil, index=-1); end
+
+  end
+
+end

data/lib/wx/doc/region_iterator.rb

@@ -0,0 +1,31 @@
+
+class Wx::RegionIterator
+
+  # Creates a Wx::RegionIterator and passes that to the given block.
+  # Removes the iterator after the block finishes.
+  # @param [Wx::Region] region
+  # @yieldparam [Wx::RegionIterator] region_it
+  def self.for_region(region)  end
+
+  # Creates a Wx::RegionIterator and iterates each rectangle in the region executing the given block
+  # for each iteration passing the region iterator.
+  # @param [Wx::Region] region
+  # @yieldparam [Wx::RegionIterator] region_it
+  def self.iterate(region) end
+
+  alias :have_rects? :have_rects
+
+  # Moves to the next rectangle of the iterated region.
+  # @return [void]
+  def next_rect; end
+
+  # If a block is given the given block is called for each rectangle in the region passing the rectangle.
+  # If no block is given an Enumerator is returned.
+  # @overload each(&block)
+  #   @yieldparam [Wx::Rect] rect
+  #   @return [Object]
+  # @overload each()
+  #   @return [Enumerator]
+  def each; end
+
+end

data/lib/wx/doc/scaled_dc.rb

@@ -10,6 +10,7 @@ class Wx
     # @param [Wx::DC] target DC to draw on (scaled)
     # @param [Float] scale scale factor
     # @yieldparam [Wx::ScaledDC] dc scaled dc to draw on
+    # @return [Object] result from block
     def self.draw_on(target, scale) end
   end
 

data/lib/wx/doc/window.rb

@@ -0,0 +1,18 @@
+
+class Wx::Window
+
+  # Creates an appropriate (temporary) DC to paint on and
+  # passes that to the given block. Deletes the DC when the block returns.
+  # Creates a Wx::PaintDC when called from an evt_paint handler and a
+  # Wx::ClientDC otherwise.
+  # @yieldparam [Wx::PaintDC,Wx::ClientDC] dc dc to paint on
+  # @return [Object] result from block
+  def paint; end
+
+  # Similar to #paint but this time creates a Wx::AutoBufferedPaintDC when called
+  # from an evt_paint handler and a Wx::ClientDC otherwise.
+  # @yieldparam [Wx::AutoBufferedPaintDC,Wx::ClientDC] dc dc to paint on
+  # @return [Object] result from block
+  def paint_buffered; end
+
+end

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '0.9.0-beta.11'
+  WXRUBY_VERSION    = '0.9.0-beta.13'
 end

data/lib/wx/wxruby/cmd/sampler.rb

@@ -15,24 +15,6 @@ module WxRuby
         "    sampler [help]|[copy DEST]\tRun wxRuby3 Sampler application (or copy samples)."
       end
 
-      def self.parse_args(args)
-        opts = OptionParser.new
-        opts.banner = "Usage: wxruby [global options] sampler [-h]|[-s PATH]\n"
-        opts.separator ''
-        opts.on('-s PATH', '--save=PATH',
-                'Save wxRuby samples under PATH.') do |v|
-          OPTIONS[:save_path] = v.to_s
-        end
-        opts.on('-h', '--help',
-                'Show this message.') do |v|
-          puts opts
-          puts
-          exit(0)
-        end
-        opts.raise_unknown = false
-        opts.parse!(args)
-      end
-
       def self.run(argv)
         if argv == :describe
           description
@@ -47,15 +29,15 @@ module WxRuby
               puts '    Starts the sampler application if called without arguments.'
               puts '    Otherwise shows this help for argument "help" or copies the included wxRuby'
               puts '    sample folders under the directory indicated by DEST for argument "copy DEST".'
-              puts '    The directory indicated  by DEST *must* already exist.'
+              puts '    The directory indicated by DEST *must* already exist.'
               puts
             elsif arg == 'copy'
               unless File.directory?(dest = argv.shift)
-                STDERR.puts "ERROR: Invalid destination folder #{DEST}"
+                STDERR.puts "ERROR: Invalid destination folder #{dest}"
                 exit(1)
               end
               Dir[File.join(WxRuby::ROOT, 'samples', '*')].each do |fp|
-                FileUtils.cp_r(fp, dest, verbose: true, noop: true)
+                FileUtils.cp_r(fp, dest, verbose: true)
               end
             end
           end

data/rakelib/lib/config.rb

@@ -145,11 +145,11 @@ module WXRuby3
     end
     private :do_run
 
-    def make_ruby_cmd(*cmd)
+    def make_ruby_cmd(*cmd, verbose: true)
       [
         FileUtils::RUBY,
         '-I', rb_lib_path,
-        (verbose? ? '-v' : nil),
+        (verbose && verbose? ? '-v' : nil),
         *cmd.flatten
       ].compact
     end
@@ -159,8 +159,8 @@ module WXRuby3
       do_run(*cmd.flatten)
     end
 
-    def run(*cmd, capture: nil)
-      do_run(*make_ruby_cmd(cmd), capture: capture)
+    def run(*cmd, capture: nil, verbose: true)
+      do_run(*make_ruby_cmd(cmd, verbose: verbose), capture: capture)
     end
 
     def debug_command(*args)

data/samples/drawing/graphics_drawing.rb

@@ -155,8 +155,7 @@ class GraphicsWindow < Wx::Window
   def on_paint
     # We do our drawing now
     rect = self.get_client_size
-    paint do |dc|
-      gdc = Wx::GraphicsContext.create(dc)
+    Wx::GraphicsContext.draw_on(self) do |gdc|
       unless @rtxt
         create_resources(gdc)
       end