wxruby3 0.9.2-x64-mingw-ucrt → 0.9.3-x64-mingw-ucrt

data/samples/sampler/ext.rb

@@ -19,36 +19,3 @@ class ::String
     self.dup.modulize!
   end
 end
-
-# Hack to make the sample loader modules behave like the normal 'toplevel' binding
-# otherwise samples using 'include Wx' (or other modules) will fail on referencing
-# a constant unscoped from one of these included modules
-class ::Module
-  def const_missing(sym)
-    if self.name.start_with?('WxRuby::Sample::SampleLoader_') && (scope = self.name.split('::')).size > 3
-      top_mod = Object.const_get(scope[0,3].join('::'))
-      return top_mod.const_get(sym)
-    end
-    begin
-      super
-    rescue NoMethodError
-      raise NameError, "uninitialized constant #{sym}"
-    end
-  end
-end
-
-# Hack to make the sample loader modules behave like the normal 'toplevel' binding
-# otherwise samples using 'include Wx' (or other modules) will fail on referencing
-# a (module) method unscoped from one of these included modules
-module ::Kernel
-  def method_missing(name, *args, &block)
-    if self.class.name.start_with?('WxRuby::Sample::SampleLoader_') && (scope = self.class.name.split('::')).size > 3
-      top_mod = Object.const_get(scope[0,3].join('::'))
-      return top_mod.__send__(name, *args, &block) if top_mod.respond_to?(name)
-      top_mod.included_modules.each do |imod|
-        return imod.__send__(name, *args, &block) if imod.respond_to?(name)
-      end
-    end
-    super
-  end
-end

data/samples/sampler/sample.rb

@@ -295,23 +295,18 @@ module WxRuby
 
       def collect_samples(&block)
         read_count = 0
-        Dir[File.join(ROOT, '*')].each do |entry|
+        Dir[File.join(ROOT, '*')].sort.each do |entry|
           if File.directory?(entry)
             category = File.basename(entry)
-            unless 'bigdemo' ==  category || 'sampler' == category
+            unless 'sampler' == category
               category.modulize!
               Dir[File.join(entry, '*.rb')].each do |rb|
                 # only if this is a file (paranoia check) and contains 'include WxRuby::Sample'
-                if File.file?(rb) && (sample_lns = File.readlines(rb, encoding: 'utf-8')).any? { |ln| /\s+include\s+WxRuby::Sample/ =~ ln }
+                if File.file?(rb) && (sample_lns = File.readlines(rb, encoding: 'utf-8')).any? { |ln| /\A\s+include\s+WxRuby::Sample/ =~ ln }
                   # register currently required files
                   cur_loaded = ::Set.new($LOADED_FEATURES)
                   @loading_sample = rb
-                  # cannot use (Kernel#load with) an anonymous module because that will break the Wx::Dialog functor
-                  # functionality for one thing (that code will attempt to define a module method for a new dialog class
-                  # in the class/module scope in which the dialog class is defined working from the dialog class name;
-                  # this will fail for anonymous modules as these cannot be identified by name)
-                  sample_mod = Sample.const_set("SampleLoader_#{File.basename(rb, '.*').modulize!}", Module.new)
-                  sample_mod.module_eval File.read(rb, encoding: 'utf-8'), rb, 1
+                  ::Kernel.load(rb)
                   # determine additionally required files
                   new_loaded = ::Set.new($LOADED_FEATURES) - cur_loaded
                   sample_captures.each do |mod|

data/samples/sampler.rb

@@ -108,7 +108,7 @@ module WxRuby
     def on_taskbar_activate(evt)
       @frame.iconize(false)
       @frame.show(true)
-      @frame.raise
+      @frame.raise_window
     end
   end
 

data/samples/splash/splash.rb

@@ -6,141 +6,143 @@
 
 require 'wx'
 
-class MyFrame < Wx::Frame
-  def initialize(title)
-    # The main application frame has no parent (nil)
-    super(nil, :title => title, :size => [ 400, 300 ])
-
-    @isPda = (Wx::SystemSettings.get_screen_type <= Wx::SYS_SCREEN_PDA)
-
-    # Give the frame an icon. PNG is a good choice of format for
-    # cross-platform images. Note that OS X doesn't have "Frame" icons.
-    icon_file = File.join(__dir__,'..', 'art', "wxruby.png")
-    self.icon = Wx::Icon.new(icon_file)
-
-    menu_bar = Wx::MenuBar.new
-    # The "file" menu
-    menu_file = Wx::Menu.new
-    # Using Wx::ID_EXIT standard id means the menu item will be given
-    # the right label for the platform and language, and placed in the
-    # correct platform-specific menu - eg on OS X, in the Application's menu
-    menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
-    menu_bar.append(menu_file, "&File")
-
-    # The "help" menu
-    menu_help = Wx::Menu.new
-    menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
-    menu_bar.append(menu_help, "&Help")
-
-    # Assign the menubar to this frame
-    self.menu_bar = menu_bar
-
-    # Create a status bar at the bottom of the frame
-    create_status_bar(2)
-    self.status_text = "Welcome to wxRuby!"
-
-    # Set it up to handle menu events using the relevant methods.
-    evt_menu Wx::ID_EXIT, :on_quit
-    evt_menu Wx::ID_ABOUT, :on_about
-  end
+module Splash
+
+  class MyFrame < Wx::Frame
+    def initialize(title)
+      # The main application frame has no parent (nil)
+      super(nil, :title => title, :size => [ 400, 300 ])
+
+      @isPda = (Wx::SystemSettings.get_screen_type <= Wx::SYS_SCREEN_PDA)
+
+      # Give the frame an icon.
+      self.icon = Wx.Icon(:sample, Wx::BITMAP_TYPE_XPM, art_path: File.join(__dir__, '..'))
+
+      menu_bar = Wx::MenuBar.new
+      # The "file" menu
+      menu_file = Wx::Menu.new
+      # Using Wx::ID_EXIT standard id means the menu item will be given
+      # the right label for the platform and language, and placed in the
+      # correct platform-specific menu - eg on OS X, in the Application's menu
+      menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit this program")
+      menu_bar.append(menu_file, "&File")
+
+      # The "help" menu
+      menu_help = Wx::Menu.new
+      menu_help.append(Wx::ID_ABOUT, "&About...\tF1", "Show about dialog")
+      menu_bar.append(menu_help, "&Help")
+
+      # Assign the menubar to this frame
+      self.menu_bar = menu_bar
+
+      # Create a status bar at the bottom of the frame
+      create_status_bar(2)
+      self.status_text = "Welcome to wxRuby!"
+
+      # Set it up to handle menu events using the relevant methods.
+      evt_menu Wx::ID_EXIT, :on_quit
+      evt_menu Wx::ID_ABOUT, :on_about
+    end
 
-  # End the application; it should finish automatically when the last
-  # window is closed.
-  def on_quit
-    close(true)
-  end
+    # End the application; it should finish automatically when the last
+    # window is closed.
+    def on_quit
+      close(true)
+    end
 
-  def on_about
-    bitmap = Wx::Bitmap.new(File.join(__dir__, @isPda ? 'mobile.xpm' : 'splash.png'))
+    def on_about
+      bitmap = Wx::Bitmap.new(File.join(__dir__, @isPda ? 'mobile.xpm' : 'splash.png'))
 
-    if bitmap.ok?
-      image = bitmap.convert_to_image
+      if bitmap.ok?
+        image = bitmap.convert_to_image
 
-      # do not scale on already small screens
-      image.rescale(bitmap.width/2, bitmap.height/2) unless @isPda
+        # do not scale on already small screens
+        image.rescale(bitmap.width/2, bitmap.height/2) unless @isPda
 
-      bitmap = Wx::Bitmap.new(image)
+        bitmap = Wx::Bitmap.new(image)
 
-      splash = Wx::SplashScreen.new(bitmap,
-                                    Wx::SPLASH_CENTRE_ON_PARENT | Wx::SPLASH_NO_TIMEOUT,
-                          0, self,
-                                    style: Wx::SIMPLE_BORDER|Wx::STAY_ON_TOP)
+        splash = Wx::SplashScreen.new(bitmap,
+                                      Wx::SPLASH_CENTRE_ON_PARENT | Wx::SPLASH_NO_TIMEOUT,
+                            0, self,
+                                      style: Wx::SIMPLE_BORDER|Wx::STAY_ON_TOP)
 
-      win = splash.get_splash_window
-      text = Wx::StaticText.new(win,
-                                id: Wx::ID_EXIT,
-                                label: "click somewhere\non this image",
-                                pos: [@isPda ? 0 : 13, @isPda ? 0 : 11])
-      text.set_background_colour(Wx::WHITE)
-      text.set_foreground_colour(Wx::BLACK)
-      font = text.font
-      font.set_fractional_point_size(2.0*font.get_fractional_point_size/3.0)
-      text.font = font
+        win = splash.get_splash_window
+        text = Wx::StaticText.new(win,
+                                  id: Wx::ID_EXIT,
+                                  label: "click somewhere\non this image",
+                                  pos: [@isPda ? 0 : 13, @isPda ? 0 : 11])
+        text.set_background_colour(Wx::WHITE)
+        text.set_foreground_colour(Wx::BLACK)
+        font = text.font
+        font.set_fractional_point_size(2.0*font.get_fractional_point_size/3.0)
+        text.font = font
+      end
     end
-  end
 
-end
+  end
 
-class SplashApp < Wx::App
+  class SplashApp < Wx::App
 
-  def on_init
-    # create the main application window
-    frame = MyFrame.new('Wx::SplashScreen sample application')
+    def on_init
+      # create the main application window
+      frame = MyFrame.new('Wx::SplashScreen sample application')
 
-    bitmap = Wx::Bitmap.new(File.join(__dir__, @isPda ? 'mobile.xpm' : 'splash.png'))
+      bitmap = Wx::Bitmap.new(File.join(__dir__, @isPda ? 'mobile.xpm' : 'splash.png'))
 
-    if bitmap.ok?
-      # we can even draw dynamic artwork onto our splashscreen
-      decorate_splash_screen(bitmap)
+      if bitmap.ok?
+        # we can even draw dynamic artwork onto our splashscreen
+        decorate_splash_screen(bitmap)
 
-      # show the splashscreen
-      Wx::SplashScreen.new(bitmap,
-                           Wx::SPLASH_CENTRE_ON_SCREEN|Wx::SPLASH_TIMEOUT,
-                 6000, frame,
-                           style: Wx::SIMPLE_BORDER|Wx::STAY_ON_TOP)
-    end
+        # show the splashscreen
+        Wx::SplashScreen.new(bitmap,
+                             Wx::SPLASH_CENTRE_ON_SCREEN|Wx::SPLASH_TIMEOUT,
+                   6000, frame,
+                             style: Wx::SIMPLE_BORDER|Wx::STAY_ON_TOP)
+      end
 
-    self.yield
+      self.yield
 
-    # and show it (the frames, unlike simple controls, are not shown when
-    # created initially)
-    frame.show(true)
+      # and show it (the frames, unlike simple controls, are not shown when
+      # created initially)
+      frame.show(true)
 
-    # success: the app will enter the main message
-    # loop and the application will run. If we returned false here, the
-    # application would exit immediately.
-    true
-  end
+      # success: the app will enter the main message
+      # loop and the application will run. If we returned false here, the
+      # application would exit immediately.
+      true
+    end
 
-  def decorate_splash_screen(bmp)
-    # use a memory DC to draw directly onto the bitmap
-    bmp.draw do |memDc|
-      # draw an orange box (with black outline) at the bottom of the splashscreen.
-      # this box will be 8% of the height of the bitmap, and be at the bottom.
-      bannerRect = Wx::Rect.new(Wx::Point.new(0, ((bmp.height / 10)*9.2).to_i),
-                                Wx::Point.new(bmp.width, bmp.height))
-      memDc.with_brush Wx::Brush.new(Wx::Colour.new(255, 102, 0)) do
-        memDc.draw_rectangle(bannerRect)
-        memDc.draw_line(bannerRect.top_left, bannerRect.top_right)
-
-        # dynamically get the wxWidgets version to display
-        description = "wxRuby %s" % Wx::WXRUBY_VERSION
-        # create a copyright notice that uses the year that this file is run
-        copyrightLabel = "%s%s wxWidgets. %s" % ["\xc2\xa9", Time.now.year.to_s, "All rights reserved."]
-
-        # draw the (white) labels inside of our orange box (at the bottom of the splashscreen)
-        memDc.set_text_foreground(Wx::WHITE)
-        # draw the "wxRuby" label on the left side, vertically centered.
-        # note that we deflate the banner rect a little bit horizontally
-        # so that the text has some padding to its left.
-        labelRect = bannerRect.deflate([5, 0])
-        memDc.draw_label(description, labelRect, Wx::ALIGN_CENTRE_VERTICAL | Wx::ALIGN_LEFT)
-
-        # draw the copyright label on the right side
-        memDc.font = Wx::FontInfo.new(8)
-        memDc.draw_label(copyrightLabel, labelRect, Wx::ALIGN_CENTRE_VERTICAL | Wx::ALIGN_RIGHT)
+    def decorate_splash_screen(bmp)
+      # use a memory DC to draw directly onto the bitmap
+      bmp.draw do |memDc|
+        # draw an orange box (with black outline) at the bottom of the splashscreen.
+        # this box will be 8% of the height of the bitmap, and be at the bottom.
+        bannerRect = Wx::Rect.new(Wx::Point.new(0, ((bmp.height / 10)*9.2).to_i),
+                                  Wx::Point.new(bmp.width, bmp.height))
+        memDc.with_brush Wx::Brush.new(Wx::Colour.new(255, 102, 0)) do
+          memDc.draw_rectangle(bannerRect)
+          memDc.draw_line(bannerRect.top_left, bannerRect.top_right)
+
+          # dynamically get the wxWidgets version to display
+          description = "wxRuby %s" % Wx::WXRUBY_VERSION
+          # create a copyright notice that uses the year that this file is run
+          copyrightLabel = "%s%s wxWidgets. %s" % ["\xc2\xa9", Time.now.year.to_s, "All rights reserved."]
+
+          # draw the (white) labels inside of our orange box (at the bottom of the splashscreen)
+          memDc.set_text_foreground(Wx::WHITE)
+          # draw the "wxRuby" label on the left side, vertically centered.
+          # note that we deflate the banner rect a little bit horizontally
+          # so that the text has some padding to its left.
+          labelRect = bannerRect.deflate([5, 0])
+          memDc.draw_label(description, labelRect, Wx::ALIGN_CENTRE_VERTICAL | Wx::ALIGN_LEFT)
+
+          # draw the copyright label on the right side
+          memDc.font = Wx::FontInfo.new(8)
+          memDc.draw_label(copyrightLabel, labelRect, Wx::ALIGN_CENTRE_VERTICAL | Wx::ALIGN_RIGHT)
+        end
       end
     end
+
   end
 
 end
@@ -160,7 +162,7 @@ module SplashSample
   end
 
   if $0 == __FILE__
-    SplashApp.run
+    Splash::SplashApp.run
   end
 
 end