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

data/samples/drawing/bitmap.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/drawing/bitmap_image.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/drawing/graphics_drawing.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'
@@ -97,6 +102,7 @@ class GraphicsWindow < Wx::Window
     # Setup the event Handler to do the drawing on this window.
     evt_paint :on_paint
     evt_timer 1000, :animate
+    set_background_style(Wx::BG_STYLE_PAINT)
   end
   
   def create_resources(gdc)
@@ -154,38 +160,43 @@ class GraphicsWindow < Wx::Window
   def on_paint
     # We do our drawing now
     rect = self.get_client_size
-    Wx::GraphicsContext.draw_on(self) do |gdc|
-      unless @rtxt
-        create_resources(gdc)
-      end
+    paint_buffered do |paint_dc|
+      Wx::GCDC.draw_on(paint_dc) do |gcdc|
+        gdc = gcdc.get_graphics_context
+        unless @rtxt
+          create_resources(gdc)
+        end
 
-      unless @rtxt[:w] != 0
-        gdc.set_font(@rtxt[:font])
-        get_extents(gdc)
-        setup_positions
-      end
-      @rtxt.draw(gdc)
-      @gtxt.draw(gdc)
-      @btxt.draw(gdc)
-      # Draw our rectangles, if they are checked
-      15.times do
-        pen = gdc.create_pen(Wx::Pen.new(Wx::Colour.new(rand(256),rand(256),rand(256),rand(256))))
-        if @corner.is_checked
-          x = rand(rect.width)
-          y = rand(rect.height)
-          gdc.set_pen(pen)
-          gdc.draw_rectangle(x,y,x,1)
-          gdc.draw_rectangle(x,y,1,y)
+        gcdc.clear
+
+        unless @rtxt[:w] != 0
+          gdc.set_font(@rtxt[:font])
+          get_extents(gdc)
+          setup_positions
         end
-        if @rect.is_checked
-          x = rand(rect.width)
-          y = rand(rect.height)
-          w = rand(rect.width)
-          h = rand(rect.height)
-          w + x > rect.width ? (w -= x; w -= rand(150)) : 0
-          h + y > rect.height ? (h -= y; h -= rand(150)) : 0
-          gdc.set_pen(pen)
-          gdc.draw_rectangle(x,y,w,h)
+        @rtxt.draw(gdc)
+        @gtxt.draw(gdc)
+        @btxt.draw(gdc)
+        # Draw our rectangles, if they are checked
+        15.times do
+          pen = gdc.create_pen(Wx::Pen.new(Wx::Colour.new(rand(256),rand(256),rand(256),rand(256))))
+          if @corner.is_checked
+            x = rand(rect.width)
+            y = rand(rect.height)
+            gdc.set_pen(pen)
+            gdc.draw_rectangle(x,y,x,1)
+            gdc.draw_rectangle(x,y,1,y)
+          end
+          if @rect.is_checked
+            x = rand(rect.width)
+            y = rand(rect.height)
+            w = rand(rect.width)
+            h = rand(rect.height)
+            w + x > rect.width ? (w -= x; w -= rand(150)) : 0
+            h + y > rect.height ? (h -= y; h -= rand(150)) : 0
+            gdc.set_pen(pen)
+            gdc.draw_rectangle(x,y,w,h)
+          end
         end
       end
     end

data/samples/drawing/image_prt.rb

@@ -1,5 +1,11 @@
-#!/usr/bin/env ruby
-# Copyright (c) M.J.N. Corino, The Netherlands
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 ###
 
 require 'wx'

data/samples/drawing/maths_images.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2009 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/drawing/rmagic_bitmap_image.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 begin

data/samples/etc/choice.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/etc/miniframe.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/etc/sash.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/etc/scrollwin.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/etc/system_settings.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/event/activation.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/event/event.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/event/threaded.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/event/update_ui_event.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/grid/grid.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'
@@ -131,6 +136,7 @@ class GridFrame < Wx::Frame
     # (11 rows and 12 columns in this example)
     @grid.create_grid( 20, 12 )
     @grid.set_default_cell_background_colour(Wx::WHITE)
+    @grid.set_default_cell_text_colour(Wx::BLACK)
     # We can set the sizes of individual rows and columns
     # in pixels, and the label value string
     @grid.set_row_size( 0, 60 )

data/samples/grid/gridtablebase.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2009 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/html/html.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/mdi/mdi.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/minimal/minimal.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/minimal/nothing.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/printing/printing.rb

@@ -1,7 +1,12 @@
-#!/usr/bin/env ruby
-# wxRuby2 Sample Code. Copyright (c) 2004-2008 wxRuby development team
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # Adapted for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/printing/printing2.rb

@@ -1,6 +1,12 @@
-#!/usr/bin/env ruby
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+# 
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
 # wxRuby3 Sample Code. (converted from wxPython/Phoenix printing.py example)
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/propgrid/propgrid.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # PropertyGrid extended sample
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/propgrid/propgrid_minimal.rb

@@ -1,6 +1,8 @@
-#!/usr/bin/env ruby
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # wxRuby Sample Code.
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 require 'wx'
 

data/samples/propgrid/sample_props.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # PropertyGrid sample custom properties
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 class WxFontDataProperty < Wx::PG::FontProperty

data/samples/ribbon/ribbon.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby Ribbon sample
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/sampler/editor.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 sampler editor
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'wx'

data/samples/sampler/ext.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 sampler application core extensions
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 class ::String

data/samples/sampler/sample.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 sampler application
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WxRuby
@@ -155,10 +158,16 @@ module WxRuby
           desc_clone[:thumbnail] = File.join(sample_folder, File.basename(description.image_file))
           FileUtils.cp(description.image_file, desc_clone[:thumbnail])
         end
-        # copy sample specific resources (not .rb or 'tn_*.png' files and not directories)
+        # copy sample specific resources (not .rb or 'tn_*.png' files and not directories unless it's an art folder)
         Dir[File.join(path, '*')].each do |fp|
-          unless File.directory?(fp) || File.extname(fp) == '.rb' || /\Atn_.*\.png\Z/ =~ File.basename(fp)
-            FileUtils.cp(fp, File.join(sample_folder, File.basename(fp)))
+          if File.directory?(fp)
+            if File.basename(fp) == 'art'
+              FileUtils.cp_r(fp, File.join(sample_folder, File.basename(fp)))
+            end
+          else
+            unless File.extname(fp) == '.rb' || /\Atn_.*\.png\Z/ =~ File.basename(fp)
+              FileUtils.cp(fp, File.join(sample_folder, File.basename(fp)))
+            end
           end
         end
         # copy art folder to dest

data/samples/sampler/stc_editor.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 Scintilla based sampler editor control
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WxRuby

data/samples/sampler/txt_editor.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 TextCtrl based sampler editor control
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WxRuby

data/samples/sampler.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 sampler application
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'rbconfig'
@@ -119,6 +122,8 @@ module WxRuby
       # The main application frame has no parent (nil)
       super(nil, :title => title, :size => frameSize, pos: framePos)
 
+      @closing = false
+
       # 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")
@@ -197,6 +202,7 @@ module WxRuby
       @main_panel.layout
     end
 
+    attr_reader :closing
     attr_reader :running_sample
     attr_accessor :sample_editor
 
@@ -206,14 +212,17 @@ module WxRuby
         read_count = count
         @gauge.value = read_count
         Wx.get_app.yield
+        return false if @closing
         sleep 0.05
       end
 
       WxRuby::Sample.categories.size.times do |ix|
         add_category(read_count+1, ix)
         Wx.get_app.yield
+        return false if @closing
       end
       show_samples
+      true
     end
 
     def add_category(offset, cat)
@@ -340,6 +349,7 @@ module WxRuby
     end
 
     def on_close(_evt)
+      @closing = true
       @running_sample.close if @running_sample
       @sample_editor.destroy if @sample_editor
       @tbicon.remove_icon
@@ -389,6 +399,4 @@ Wx::App.run do
   @frame.show
 
   @frame.load_samples
-
-  true
 end

data/samples/splash/splash.rb

@@ -1,5 +1,7 @@
-#!/usr/bin/env ruby
-# Copyright (c) M.J.N. Corino, The Netherlands
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 
 require 'wx'