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

data/samples/drawing/maths_images.rb

@@ -10,6 +10,9 @@
 ###
 
 require 'wx'
+
+module MathImages
+
 include Wx
 
 # This sample was originally written by Alex Fenton as an answer to Ruby
@@ -31,6 +34,9 @@ include Wx
 
 # A canvas that draws and displays a mathematically generated image
 class MathsDrawing < Window
+
+  include Wx
+
   # The functions which return the colour components at each pixel
   attr_writer :red, :green, :blue
   # The time taken to render, whether re-rendering is needed, and the
@@ -118,6 +124,9 @@ end
 
 # A helper dialog for saving the image to a file
 class SaveImageDialog < FileDialog
+
+  include Wx
+
   # The image file formats on offer
   TYPES = [ [ "PNG file (*.png)|*.png", Wx::BITMAP_TYPE_PNG ],
             [ "TIF file (*.tif)|*.tif", Wx::BITMAP_TYPE_TIF ],
@@ -139,6 +148,9 @@ end
 
 # A Panel for displaying the image and controls to manipulate it
 class MathsPanel < Panel
+
+  include Wx
+
   include Math
 
   # Set functions to some nice initial values
@@ -269,6 +281,9 @@ class MathsPanel < Panel
 end
 
 class MathsFrame < Frame
+
+  include Wx
+
   def initialize
     super(nil, :title => 'Maths drawing', 
                :size => [400, 500], 
@@ -288,6 +303,8 @@ class MathsFrame < Frame
   end
 end
 
+end
+
 module MathImagesSample
 
   include WxRuby::Sample if defined? WxRuby::Sample
@@ -318,7 +335,7 @@ module MathImagesSample
   end
 
   def self.activate
-    frame = MathsFrame.new
+    frame = MathImages::MathsFrame.new
     frame.show
     frame
   end

data/samples/drawing/rmagic_bitmap_image.rb

@@ -17,102 +17,106 @@ end
 if defined? ::Magick
 require 'wx'
 
-# RMagick sample (written by Chauk-Mean Proum)
-
-# This sample demonstrates how to convert directly a RMagick image to
-# a wxRuby image (without saving and loading the image file).
-# See the magick_to_wx method.
-
-class ImageFrame < Wx::Frame
-  def initialize
-    super(nil, :title => 'RMagick sample', :size => [600, 600])
-
-    # Create the magick image from an image file
-    img_file = File.join( File.dirname(__FILE__)+"/../art",
-      'wxruby-256x256.png')
-    @magick_image = Magick::ImageList.new(img_file)
-    
-    # Create some magick images with special effects
-    @magick_image1 = @magick_image.sketch
-    @magick_image2 = @magick_image.oil_paint(4)
-    @magick_image3 = @magick_image.shade
-
-    # Convert the magick images to wxRuby images
-    @image1 = magick_to_wx(@magick_image1)
-    @image2 = magick_to_wx(@magick_image2)
-    @image3 = magick_to_wx(@magick_image3)
-
-    # Create the corresponding bitmaps
-    compute_bitmaps
-
-    # Set up event handling
-    evt_size :on_size
-    evt_idle :on_idle
-    evt_paint :on_paint
-  end
-  
-  
-  # Convert the RMagick image to a WxRuby image
-  def magick_to_wx magick_img
-    wx_img = Wx::Image.new(magick_img.columns, magick_img.rows)
-
-    # Set the image data
-    magick_img.format = 'RGB'
-    wx_img.rgb_data = magick_img.to_blob
-
-    # Set the alpha (transparency) if any
-    if magick_img.alpha?
-      magick_img.format = 'A'
-      wx_img.alpha_data = magick_img.to_blob
-    end
+module RMagickBitmap
 
-    wx_img
-  end
+  # RMagick sample (written by Chauk-Mean Proum)
 
-  # Create a bitmap for the specified image and size
-  def compute_bitmap image, width, height
-    rescaled_image = image.copy.rescale(width, height)
-    rescaled_image.to_bitmap
-  end
+  # This sample demonstrates how to convert directly a RMagick image to
+  # a wxRuby image (without saving and loading the image file).
+  # See the magick_to_wx method.
 
-  # Create the bitmaps corresponding to the images and with half the size of the frame
-  def compute_bitmaps
-    width = client_size.width / 2
-    height = client_size.height / 2
-    @bitmap1 = compute_bitmap(@image1, width, height)
-    @bitmap2 = compute_bitmap(@image2, width, height)
-    @bitmap3 = compute_bitmap(@image3, width, height)
-    @done = true
-  end
+  class ImageFrame < Wx::Frame
+    def initialize
+      super(nil, :title => 'RMagick sample', :size => [600, 600])
 
-  # Note to recompute the bitmaps on a resize
-  def on_size(event)
-    @done = false
-    event.skip
-  end
+      # Create the magick image from an image file
+      img_file = File.join( File.dirname(__FILE__)+"/../art",
+        'wxruby-256x256.png')
+      @magick_image = Magick::ImageList.new(img_file)
+
+      # Create some magick images with special effects
+      @magick_image1 = @magick_image.sketch
+      @magick_image2 = @magick_image.oil_paint(4)
+      @magick_image3 = @magick_image.shade
 
-  # Recompute the bitmaps if needed, then do a refresh
-  def on_idle
-    if not @done
+      # Convert the magick images to wxRuby images
+      @image1 = magick_to_wx(@magick_image1)
+      @image2 = magick_to_wx(@magick_image2)
+      @image3 = magick_to_wx(@magick_image3)
+
+      # Create the corresponding bitmaps
       compute_bitmaps
-      refresh
+
+      # Set up event handling
+      evt_size :on_size
+      evt_idle :on_idle
+      evt_paint :on_paint
     end
-  end
 
-  # Paint the frame with the bitmaps
-  def on_paint
-    paint do | dc |
 
-      if @done
-        offset_x = client_size.width / 4
-        offset_y = client_size.height / 4
-        dc.draw_bitmap(@bitmap1, 0, 0, true)
-        dc.draw_bitmap(@bitmap2, offset_x, offset_y, true)
-        dc.draw_bitmap(@bitmap3, offset_x*2, offset_y*2, true)
+    # Convert the RMagick image to a WxRuby image
+    def magick_to_wx magick_img
+      wx_img = Wx::Image.new(magick_img.columns, magick_img.rows)
+
+      # Set the image data
+      magick_img.format = 'RGB'
+      wx_img.rgb_data = magick_img.to_blob
+
+      # Set the alpha (transparency) if any
+      if magick_img.alpha?
+        magick_img.format = 'A'
+        wx_img.alpha_data = magick_img.to_blob
       end
 
+      wx_img
+    end
+
+    # Create a bitmap for the specified image and size
+    def compute_bitmap image, width, height
+      rescaled_image = image.copy.rescale(width, height)
+      rescaled_image.to_bitmap
+    end
+
+    # Create the bitmaps corresponding to the images and with half the size of the frame
+    def compute_bitmaps
+      width = client_size.width / 2
+      height = client_size.height / 2
+      @bitmap1 = compute_bitmap(@image1, width, height)
+      @bitmap2 = compute_bitmap(@image2, width, height)
+      @bitmap3 = compute_bitmap(@image3, width, height)
+      @done = true
+    end
+
+    # Note to recompute the bitmaps on a resize
+    def on_size(event)
+      @done = false
+      event.skip
+    end
+
+    # Recompute the bitmaps if needed, then do a refresh
+    def on_idle
+      if not @done
+        compute_bitmaps
+        refresh
+      end
+    end
+
+    # Paint the frame with the bitmaps
+    def on_paint
+      paint do | dc |
+
+        if @done
+          offset_x = client_size.width / 4
+          offset_y = client_size.height / 4
+          dc.draw_bitmap(@bitmap1, 0, 0, true)
+          dc.draw_bitmap(@bitmap2, offset_x, offset_y, true)
+          dc.draw_bitmap(@bitmap3, offset_x*2, offset_y*2, true)
+        end
+
+      end
     end
   end
+
 end
 
 module RMagickBitmapSample
@@ -130,7 +134,7 @@ module RMagickBitmapSample
   end
 
   def self.activate
-    frame = ImageFrame.new
+    frame = RMagickBitmap::ImageFrame.new
     frame.show
     frame
   end

data/samples/etc/caret.rb

@@ -0,0 +1,306 @@
+# 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
+###
+
+require 'wx'
+
+module CaretTest
+
+  include Wx
+
+  # menu items
+  Caret_set_blink_time = 3
+  Caret_Move = 4
+
+  # controls start here (the numbers are, of course, arbitrary)
+  Caret_Text = 1000
+
+
+  # MyCanvas is a canvas on which you can type
+  class MyCanvas < ScrolledWindow
+
+    include Wx
+
+    def initialize(parent)
+      super(parent, :style => SUNKEN_BORDER)
+
+      self.background_colour = WHITE
+
+      @font = Font.new(12, FONTFAMILY_TELETYPE,
+                       FONTSTYLE_NORMAL, FONTWEIGHT_NORMAL)
+
+      @x_caret = @y_caret = @x_chars = @y_chars = 0
+      @x_margin = @y_margin = 5
+      @text = nil
+
+      create_caret
+
+      evt_paint :on_paint
+      evt_size :on_size
+      evt_char :on_char
+    end
+
+    def [](x,y)
+      @text[x + @x_chars * y,1]
+    end
+
+    def []=(x,y,z)
+      @text[x + @x_chars * y,1] = z
+    end
+
+    # caret movement
+    def home_pos
+      @x_caret = 0
+    end
+
+    def end_pos
+      @x_caret = @x_chars - 1
+    end
+
+    def first_line
+      @y_caret = 0
+    end
+
+    def last_line
+      @y_caret = @y_chars - 1
+    end
+
+    def prev_char
+      if @x_caret == 0
+        end_pos
+        prev_line
+      else
+        @x_caret -= 1
+      end
+    end
+
+    def next_char
+      @x_caret += 1
+      if @x_caret == @x_chars
+        home_pos
+        next_line
+      end
+    end
+
+    def prev_line
+      if @y_caret == 0
+        last_line
+      else
+        @y_caret -= 1
+      end
+    end
+
+    def next_line
+      @y_caret += 1
+      if @y_caret == @y_chars
+        first_line
+      end
+    end
+
+    def create_caret
+      paint do | dc |
+        dc.font = @font
+        @height_char = dc.char_height
+        @width_char = dc.char_width
+
+        my_caret = Caret.new(self, Size.new(@width_char, @height_char))
+        self.caret = my_caret
+
+        caret.move [ @x_margin, @y_margin ]
+        caret.show
+      end
+    end
+
+    def move_caret(x,y)
+      @x_caret = x
+      @y_caret = y
+
+      do_move_caret
+    end
+
+    def do_move_caret
+      log_status("Caret is at (%d, %d)", @x_caret, @y_caret)
+
+      caret.move( [@x_margin + @x_caret * @width_char,
+                   @y_margin + @y_caret * @height_char])
+    end
+
+    def on_size(event)
+      @x_chars = (event.size.width - 2 * @x_margin) / @width_char
+      @y_chars = (event.size.height - 2 * @y_margin) / @height_char
+      if @x_chars <= 0
+        @x_chars = 1
+      end
+      if @y_chars <= 0
+        @y_chars = 1
+      end
+      if @x_caret >= @x_chars
+        @x_caret = @x_chars-1
+      end
+      if @y_caret >= @y_chars
+        @y_caret = @y_chars-1
+      end
+
+      @text = " " * @x_chars * @y_chars
+
+      if parent && parent.status_bar
+        msg = sprintf("Panel size is (%d, %d)", @x_chars, @y_chars)
+        parent.set_status_text(msg, 1)
+        parent.refresh
+      end
+      event.skip
+    end
+
+    def on_paint
+      if caret
+        caret.hide
+      end
+
+      paint do | dc |
+        dc.clear
+        dc.set_font(@font)
+
+        for y in 0 ... @y_chars
+          line = @text[@x_chars * y,@x_chars]
+          dc.draw_text( line, @x_margin, @y_margin + y * @height_char )
+        end
+      end
+
+      if caret
+        caret.show
+      end
+    end
+
+    def on_char(event)
+      case event.key_code
+      when K_LEFT, K_BACK
+        prev_char
+      when K_RIGHT
+        next_char
+      when K_UP
+        prev_line
+      when K_DOWN
+        next_line
+      when K_HOME
+        home_pos
+      when K_END
+        end_pos
+      when K_RETURN
+        home_pos
+        next_line
+      else
+        ch = event.key_code
+        if !event.alt_down and (ch >= K_SPACE) and (ch < K_DELETE)
+          self[@x_caret, @y_caret] = ch.chr
+          refresh
+          next_char
+        else
+          event.skip
+        end
+      end
+      do_move_caret
+    end
+  end
+
+  class MyFrame < Frame
+
+    include Wx
+
+    def initialize(title, pos, size)
+      super(nil, -1, title, pos, size)
+      # set the frame icon
+      self.icon = Wx.Icon(:sample, Wx::BITMAP_TYPE_XPM, art_path: File.join(__dir__, '..'))
+
+      # create a menu bar
+      menu_file = Menu.new
+
+      menu_file.append(Caret_set_blink_time, "&Blink time...\tCtrl-B")
+      menu_file.append(Caret_Move, "&Move caret\tCtrl-C")
+      menu_file.append_separator
+      menu_file.append(Wx::ID_ABOUT, "&About...\tCtrl-A", "Show about dialog")
+      menu_file.append_separator
+      menu_file.append(Wx::ID_EXIT, "E&xit\tAlt-X", "Quit self program")
+
+      # now append the freshly created menu to the menu bar...
+      menu_bar = MenuBar.new
+      menu_bar.append(menu_file, "&File")
+
+      # ... and attach self menu bar to the frame
+      self.menu_bar = menu_bar
+
+      @canvas = MyCanvas.new(self)
+
+      # This is required to set focus so that key events are directed to
+      # this Window, on Linux/GTK in particular
+      @canvas.set_focus
+
+      # create a status bar just for fun (by default with 1 pane only)
+      create_status_bar(2)
+      self.status_text = "Welcome to Windows!"
+
+      evt_menu Wx::ID_EXIT, :on_quit
+      evt_menu Wx::ID_ABOUT, :on_about
+      evt_menu Caret_set_blink_time, :on_set_blink_time
+      evt_menu Caret_Move, :on_caret_move
+    end
+
+    def on_quit
+      # true is to force the frame to close
+      close(true)
+    end
+
+    def on_about
+      message_box("The caret Windows sample, adapted for WxRuby",
+                  "About Caret", OK | ICON_INFORMATION, self)
+    end
+
+    def on_caret_move
+      @canvas.move_caret(10, 10)
+    end
+
+    def on_set_blink_time
+      blink_time = get_number_from_user(
+                     "The caret blink time is the time between two blinks",
+                     "Time in milliseconds:",
+                     "Caret sample",
+                     Caret::get_blink_time, 0, 10000,
+                     self)
+      if blink_time != -1
+        Caret::set_blink_time(blink_time)
+        @canvas.create_caret
+        log_status(self,"Blink time set to %d milliseconds.", blink_time)
+      end
+    end
+  end
+
+end
+
+module CaretSample
+
+  include WxRuby::Sample if defined? WxRuby::Sample
+
+  def self.describe
+    { file: __FILE__,
+      summary: 'wxRuby Caret example.',
+      description: 'wxRuby example demonstrating using and controlling a caret.' }
+  end
+
+  def self.run
+    execute(__FILE__)
+  end
+
+  if $0 == __FILE__
+    Wx::App.run do
+      frame = CaretTest::MyFrame.new("Caret Windows sample",[50, 50],[450, 340])
+      frame.show(true)
+    end
+  end
+
+end