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

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'

data/samples/text/art/richtext/alignleft.xpm

@@ -0,0 +1,24 @@
+/* XPM */
+static const char *const alignleft_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 2 1",
+". c #4D4D4D",
+"  c None",
+/* pixels */
+"                ",
+"                ",
+" .............. ",
+"                ",
+" ..........     ",
+"                ",
+" .............. ",
+"                ",
+" ..........     ",
+"                ",
+" .............. ",
+"                ",
+" ..........     ",
+"                ",
+"                ",
+"                "
+};

data/samples/text/art/richtext/alignright.xpm

@@ -0,0 +1,24 @@
+/* XPM */
+static const char *const alignright_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 2 1",
+". c #4D4D4D",
+"  c None",
+/* pixels */
+"                ",
+"                ",
+" .............. ",
+"                ",
+"     .......... ",
+"                ",
+" .............. ",
+"                ",
+"     .......... ",
+"                ",
+" .............. ",
+"                ",
+"     .......... ",
+"                ",
+"                ",
+"                "
+};

data/samples/text/art/richtext/bold.xpm

@@ -0,0 +1,24 @@
+/* XPM */
+static const char *const bold_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 2 1",
+". c Black",
+"  c None",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"    ........    ",
+"     ...  ...   ",
+"     ...  ...   ",
+"     ...  ...   ",
+"     .......    ",
+"     ...  ...   ",
+"     ...  ...   ",
+"     ...  ...   ",
+"    ........    ",
+"                ",
+"                ",
+"                ",
+"                "
+};

data/samples/text/art/richtext/centre.xpm

@@ -0,0 +1,24 @@
+/* XPM */
+static const char *const centre_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 2 1",
+". c #4D4D4D",
+"  c None",
+/* pixels */
+"                ",
+"                ",
+" .............. ",
+"                ",
+"   ..........   ",
+"                ",
+" .............. ",
+"                ",
+"   ..........   ",
+"                ",
+" .............. ",
+"                ",
+"   ..........   ",
+"                ",
+"                ",
+"                "
+};

data/samples/text/art/richtext/copy.xpm

@@ -0,0 +1,45 @@
+/* XPM */
+static const char *const copy_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 23 1",
+"o c #97C4E7",
+"* c #FFFFFF",
+"@ c #60A9DA",
+"= c #D1E5F5",
+"& c #C3DDF1",
+". c #7EA6C0",
+"  c None",
+"X c #2F93CD",
+"O c #85BBE2",
+", c #EFF6FC",
+"; c #DEEDF8",
+"+ c #72B2DD",
+"3 c #F7FBFD",
+"4 c #FAFCFE",
+": c #DAEAF7",
+"< c #E9F3FA",
+"1 c #E2EFF8",
+"- c #FDFDFE",
+"% c #B6D5EE",
+"$ c #A5CCEA",
+"> c #E5F0F9",
+"# c #AFD1EC",
+"2 c #F4F9FD",
+/* pixels */
+" .....XX        ",
+" .oO+@X#X       ",
+" .$oO+X##X      ",
+" .%$o........   ",
+" .&%$.*=&#o.-.  ",
+" .=&%.*;=&#.--. ",
+" .:=&.*>;=&.... ",
+" .>:=.*,>;=&#o. ",
+" .<1:.*2,>:=&#. ",
+" .2<1.*32,>:=&. ",
+" .32<.*432,>:=. ",
+" .32<.*-432,>:. ",
+" .....**-432,>. ",
+"     .***-432,. ",
+"     .......... ",
+"                "
+};

data/samples/text/art/richtext/cut.xpm

@@ -0,0 +1,47 @@
+/* XPM */
+static const char *const cut_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 25 1",
+"6 c #D8BDC0",
+": c #C3C3C4",
+"- c #FFFFFF",
+". c #6C6D70",
+"2 c #AD3A45",
+"o c #DBDBDB",
+"# c #939495",
+"< c #E42234",
+"& c #C3C5C8",
+"; c #C6CCD3",
+"% c #B7B7B8",
+"  c None",
+"* c #DFE0E2",
+"5 c #B69596",
+"3 c #9C2A35",
+"1 c #CFCFD0",
+", c #AB5C64",
+"+ c #D2D3D4",
+"$ c #BCBDBE",
+"@ c #C6C8CA",
+"> c #CDC0C1",
+"O c #826F72",
+"X c #979BA0",
+"4 c #9B8687",
+"= c #9FA0A0",
+/* pixels */
+"   .X     .o    ",
+"   O.+   @.     ",
+"    O.   ..     ",
+"    O#$ %.&     ",
+"     O.*..      ",
+"     #%#..      ",
+"     O=-..      ",
+"     #%#;.      ",
+"     OO:=O      ",
+"  >,,<, ,<,,1   ",
+" ><23<1 1<32<1  ",
+" ,2 4<   <5 2,  ",
+" <, ,2   2, ,<  ",
+" 23,<5   5<,32  ",
+" 6225     522>  ",
+"                "
+};

data/samples/text/art/richtext/font.xpm

@@ -0,0 +1,25 @@
+/* XPM */
+static const char *const font_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 3 1",
+"X c #A6A6A6",
+"  c None",
+". c #4D4DA6",
+/* pixels */
+"                ",
+"                ",
+"        .       ",
+"       X.X      ",
+"       ...      ",
+"      X...X     ",
+"      .. ..     ",
+"     X.  ..X    ",
+"     .......    ",
+"    X.    ..X   ",
+"    ..    X..   ",
+"   X.     X..X  ",
+"  ....   ...... ",
+"                ",
+"                ",
+"                "
+};

data/samples/text/art/richtext/idea.xpm

@@ -0,0 +1,47 @@
+/* XPM */
+static const char *const idea_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 9 1",
+"$ c Black",
+"O c #FFFFFF",
+"@ c #808080",
+"+ c #000080",
+"o c #E8EB01",
+"  c None",
+"X c #FFFF40",
+"# c #C0C0C0",
+". c #ABAD01",
+/* pixels */
+"                                ",
+"             .....              ",
+"           ..XXXXX..            ",
+"         ..XXXXXXXXo..          ",
+"        .XXXOXXXXXXXoo.         ",
+"        .XOOXXX+XXXXXo.         ",
+"       .XOOOXX+++XXXXoo.        ",
+"       .XOOXXX+++XXXXXo.        ",
+"      .XOOOXXX+++XXXXXXo.       ",
+"      .XOOXXXX+++XXXXXXo.       ",
+"      .XXXXXXX+++XXXXXXX.       ",
+"      .XXXXXXX+++XXXXXXo.       ",
+"      .XXXXXXX+++XXXXXoo.       ",
+"       .XXXXXX+++XXXXXo.        ",
+"       .XXXXXXX+XXXXXXo.        ",
+"        .XXXXXXXXXXXXo.         ",
+"        .XXXXX+++XXXoo.         ",
+"         .XXXX+++XXoo.          ",
+"          .XXXXXXXXo.           ",
+"          ..XXXXXXo..           ",
+"           .XXXXXo..            ",
+"           @#######@            ",
+"           @@@@@@@@@            ",
+"           @#######@            ",
+"           @@@@@@@@@            ",
+"           @#######@            ",
+"            @@@@@@@             ",
+"              ###               ",
+"              $$$               ",
+"                                ",
+"                                ",
+"                                "
+};

data/samples/text/art/richtext/indentless.xpm

@@ -0,0 +1,25 @@
+/* XPM */
+static const char *const indentless_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 3 1",
+". c #4D4D4D",
+"  c None",
+"X c #4D4DA6",
+/* pixels */
+"       .        ",
+"                ",
+"  .... .........",
+"                ",
+"  X    .........",
+" XX    .........",
+"XXXXX           ",
+" XX    ......   ",
+"  X    ......   ",
+"                ",
+"  .... .........",
+"                ",
+"  .... ..       ",
+"                ",
+"       .        ",
+"                "
+};