Merge pull request #258 from mcorino/develop

Develop

lib/wx/doc/app.rb

@@ -9,6 +9,16 @@ module Wx
 
   class App
 
+    # Run the (main loop for) the application instance.
+    # Optionally runs a given block as the applications #on_init callback
+    # if no actual #on_init method has been defined.
+    # A given block will be ignored if an actual #on_init method has been defined.
+    def run(&block) end
+
+    # Convenience method to instantiate an application object of the class
+    # and call the {#run} method for that application object.
+    def self.run(&block) end
+
     class << self
 
       # Set the menu item id for the About menu item.

lib/wx/doc/bitmap.rb

@@ -14,6 +14,8 @@ module Wx
   # Default BitmapType for current platform. Actual value is platform dependent.
   CURSOR_DEFAULT_TYPE = Wx::BitmapType::BITMAP_TYPE_ANY
 
+  # @!group Art creation methods
+
   # Searches for an art file with basename 'name' and creates a Bitmap 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
@@ -28,4 +30,6 @@ module Wx
   # @see Wx::ArtLocator::find_art
   def self.Bitmap(name, bmp_type = nil, art_path: nil, art_section: nil); end
 
+  # @!endgroup
+
 end

lib/wx/doc/cursor.rb

@@ -7,6 +7,8 @@
 
 class Wx
 
+  # @!group Art creation methods
+
   # Searches for an art file with basename 'name' and creates a Cursor 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
@@ -21,4 +23,6 @@ class Wx
   # @see Wx::ArtLocator::find_art
   def self.Cursor(name, bmp_type = nil, art_path: nil, art_section: nil); end
 
+  # @!endgroup
+
 end

lib/wx/doc/functions.rb

@@ -102,10 +102,9 @@ def self.log_status(fmt, *args) end
 
   # @!endgroup
 
-  # @!group Other class methods
-
   # Returns the global app object
-  # @return [Wx::App] the global app object
+  # Returns nil if no app instance is active.
+  # @return [Wx::App,nil] the global app object
   def self.get_app; end
 
   # Returns the pointer address of the underlying C++ object as a hex
@@ -124,8 +123,6 @@ def self.end_busy_cursor; end
   def self.bell; end
   def self.safe_yield(win = nil, only_if_needed = false) end
 
-  # @!endgroup
-
   # @!group System information
 
   # @return [String]

lib/wx/doc/icon.rb

@@ -7,6 +7,8 @@
 
 class Wx
 
+  # @!group Art creation methods
+
   # 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
@@ -23,4 +25,6 @@ class Wx
   # @see Wx::ArtLocator::find_art
   def self.Icon(name, bmp_type = nil, desired_width=-1, desired_height=-1, art_path: nil, art_section: nil); end
 
+  # @!endgroup
+
 end

lib/wx/doc/image.rb

@@ -53,6 +53,8 @@ def compute_histogram; end
 
   end
 
+  # @!group Art creation methods
+
   # 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
@@ -68,4 +70,6 @@ def compute_histogram; end
   # @see Wx::ArtLocator::find_art
   def self.Image(name, bmp_type = nil, index=-1, art_path: nil, art_section: nil); end
 
+  # @!endgroup
+
 end

rakelib/yard/templates/default/fulldoc/html/setup.rb

@@ -4,16 +4,16 @@ def init
   # It seems YARD messes things up so that a lot of classes, modules and constants are not properly
   # registered in their enclosing namespaces.
   # This hack makes sure that if that is the case we fix that here.
-  all_objects = Registry.all(:class, :constant, :module)
+  all_objects = Registry.all(:class, :constant, :module, :method)
   all_objects.each do |c|
     if (ns = c.namespace)
       unless ns.children.any? { |nsc| nsc.path == c.path }
-        ns.children << c # class/module/constant missing from child list of enclosing namespace -> add here
+        ns.children << c # class/module/constant/method missing from child list of enclosing namespace -> add here
       end
     end
     if (ns = Registry[c.namespace.path])
       unless ns.children.any? { |nsc| nsc.path == c.path }
-        ns.children << c # class/module/constant missing from child list of enclosing namespace -> add here
+        ns.children << c # class/module/constant/method missing from child list of enclosing namespace -> add here
       end
     end
   end