wxruby3 0.9.0.pre.rc.3 → 0.9.1

data/lib/wx/rtc/keyword_defs.rb

@@ -1,6 +1,13 @@
+# 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
+
 # = WxSugar - Keyword Constructors Classes
 # Wx::RTC sub package for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 Wx::define_keyword_ctors(Wx::RTC::RichTextCtrl) do
   wx_ctor_params :id, :value => ''
@@ -8,10 +15,14 @@ Wx::define_keyword_ctors(Wx::RTC::RichTextCtrl) do
   wx_ctor_params :validator, :name => 'textCtrl'
 end
 
-# Wx::define_keyword_ctors(Wx::RTC::RichTextStyleListBox) do
-#   wx_ctor_params :id, :pos, :size, :style
-# end
+Wx::define_keyword_ctors(Wx::RTC::RichTextStyleListBox) do
+  wx_ctor_params :id, :pos, :size, :style
+end
 
-# Wx::define_keyword_ctors(Wx::RTC::RichTextStyleListCtrl) do
-#   wx_ctor_params :id, :pos, :size, :style
-# end
+Wx::define_keyword_ctors(Wx::RTC::RichTextStyleListCtrl) do
+  wx_ctor_params :id, :pos, :size, :style
+end
+
+Wx::define_keyword_ctors(Wx::RTC::RichTextStyleComboCtrl) do
+  wx_ctor_params :id, :pos, :size, :style
+end

data/lib/wx/rtc/require.rb

@@ -1,8 +1,15 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::RTC sub package for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 require_relative './ext'
 require_relative './events/evt_list'
 require_relative './keyword_defs'
+require_relative './richtext_buffer'
+require_relative './richtext_formatting_dialog'
+require_relative './symbol_picker_dialog'
+require_relative './richtext_style_organiser_dialog'
 
 Wx::Dialog.setup_dialog_functors(Wx::RTC)

data/lib/wx/rtc/richtext_buffer.rb

@@ -0,0 +1,36 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+class Wx::RTC::RichTextBuffer
+
+  class << self
+    wx_each_handler = instance_method :each_handler
+    define_method :each_handler do |&block|
+      if block_given?
+        wx_each_handler.bind(self).call(&block)
+      else
+        ::Enumerator.new { |y| wx_each_handler.bind(self).call { |h| y << h } }
+      end
+    end
+
+    wx_each_field_type = instance_method :each_field_type
+    define_method :each_field_type do |&block|
+      if block_given?
+        wx_each_field_type.bind(self).call(&block)
+      else
+        ::Enumerator.new { |y| wx_each_field_type.bind(self).call { |ft| y << ft } }
+      end
+    end
+
+    wx_each_drawing_handler = instance_method :each_drawing_handler
+    define_method :each_drawing_handler do |&block|
+      if block_given?
+        wx_each_drawing_handler.bind(self).call(&block)
+      else
+        ::Enumerator.new { |y| wx_each_drawing_handler.bind(self).call { |h| y << h } }
+      end
+    end
+  end
+
+end

data/lib/wx/rtc/richtext_formatting_dialog.rb

@@ -0,0 +1,88 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+module Wx::RTC
+  class RichTextFormattingDialog
+
+    class << self
+
+      wx_set_formatting_dialog_factory = instance_method :set_formatting_dialog_factory
+      define_method :set_formatting_dialog_factory do |factory|
+        wx_set_formatting_dialog_factory.bind(self).call(factory)
+        @factory = factory # cache here to prevent GC collection
+      end
+
+    end
+
+    # special handling for keyword ctor extension here
+    # as this class deviates from 'normal' window ctors
+    Wx::define_keyword_ctors(Wx::RTC::RichTextFormattingDialog) do
+      wx_ctor_params :title => 'Formatting'
+      wx_ctor_params :id, :pos, :size, :style => Wx::DEFAULT_DIALOG_STYLE
+    end
+
+    # now redefine the overridden ctor to account for deviating arglist
+    def initialize(flags = nil, parent = nil, *mixed_args, &block)
+      # allow zero-args ctor for use with XRC
+      if flags.nil?
+        pre_wx_kwctor_init
+        return
+      end
+
+      real_args = begin
+                    [ flags, parent ] + self.class.args_as_list(*mixed_args)
+                  rescue => err
+                    msg = "Error initializing #{self.inspect}\n"+
+                      " : #{err.message} \n" +
+                      "Provided are #{[ flags, parent ] + mixed_args} \n" +
+                      "Correct parameters for #{self.class.name}.new are:\n" +
+                      self.class.describe_constructor(
+                        ":flags => (Integer)\n:parent => (Wx::Window)\n")
+
+                    new_err = err.class.new(msg)
+                    new_err.set_backtrace(caller)
+                    Kernel.raise new_err
+                  end
+      begin
+        pre_wx_kwctor_init(*real_args)
+      rescue => err
+        msg = "Error initializing #{self.inspect}\n"+
+          " : #{err.message} \n" +
+          "Provided are #{real_args} \n" +
+          "Correct parameters for #{self.class.name}.new are:\n" +
+          self.class.describe_constructor(
+            ":flags => (Integer)\n:parent => (Wx::Window)\n")
+
+        new_err = err.class.new(msg)
+        new_err.set_backtrace(caller)
+        Kernel.raise new_err
+      end
+    end
+
+  end
+
+  # undocumented flag constants
+  RICHTEXT_FORMAT_MARGINS = 0x0040
+  RICHTEXT_FORMAT_SIZE = 0x0080
+  RICHTEXT_FORMAT_BORDERS = 0x0100
+  RICHTEXT_FORMAT_BACKGROUND = 0x0200
+
+  class RichTextObjectPropertiesDialog < RichTextFormattingDialog
+
+    ID_RICHTEXTOBJECTPROPERTIESDIALOG = 10650
+
+    def initialize(*args)
+      super()
+      create(*args)
+    end
+
+    def create(obj, parent, id = ID_RICHTEXTOBJECTPROPERTIESDIALOG, caption = 'Object Properties', pos = Wx::DEFAULT_POSITION, size = [400,300], style = Wx::DEFAULT_DIALOG_STYLE|Wx::TAB_TRAVERSAL)
+      set_object(obj)
+      set_extra_style(Wx::DIALOG_EX_CONTEXTHELP)
+      flags = Wx::RTC::RICHTEXT_FORMAT_SIZE|Wx::RTC::RICHTEXT_FORMAT_MARGINS|Wx::RTC::RICHTEXT_FORMAT_BORDERS|Wx::RTC::RICHTEXT_FORMAT_BACKGROUND
+      super(flags, parent, caption, id, pos, size, style)
+    end
+
+  end
+end

data/lib/wx/rtc/richtext_style_organiser_dialog.rb

@@ -0,0 +1,46 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+class Wx::RTC::RichTextStyleOrganiserDialog
+
+  # special handling for keyword ctor extension here
+  # as this class deviates from 'normal' window ctors
+  Wx::define_keyword_ctors(Wx::RTC::RichTextStyleOrganiserDialog) do
+    wx_ctor_params :id, :caption => 'Style Organiser'
+    wx_ctor_params :pos, :size, :style => Wx::DEFAULT_DIALOG_STYLE|Wx::RESIZE_BORDER|Wx::SYSTEM_MENU|Wx::CLOSE_BOX
+  end
+
+  # now redefine the overridden ctor to account for deviating arglist
+  def initialize(flags, sheet, ctrl, parent = nil, *mixed_args, &block)
+    real_args = begin
+                  [ flags, sheet, ctrl, parent ] + self.class.args_as_list(*mixed_args)
+                rescue => err
+                  msg = "Error initializing #{self.inspect}\n"+
+                    " : #{err.message} \n" +
+                    "Provided are #{[ flags, sheet, ctrl, parent ] + mixed_args} \n" +
+                    "Correct parameters for #{self.class.name}.new are:\n" +
+                    self.class.describe_constructor(
+                      ":flags => (Integer)\n:sheet => (Wx::RTC::RichTextStyleSheet)\n:ctrl => (Wx::RTC::RichTextCtrl)\n:parent => (Wx::Window)\n")
+
+                  new_err = err.class.new(msg)
+                  new_err.set_backtrace(caller)
+                  Kernel.raise new_err
+                end
+    begin
+      pre_wx_kwctor_init(*real_args)
+    rescue => err
+      msg = "Error initializing #{self.inspect}\n"+
+        " : #{err.message} \n" +
+        "Provided are #{real_args} \n" +
+        "Correct parameters for #{self.class.name}.new are:\n" +
+        self.class.describe_constructor(
+          ":flags => (Integer)\n:sheet => (Wx::RTC::RichTextStyleSheet)\n:ctrl => (Wx::RTC::RichTextCtrl)\n:parent => (Wx::Window)\n")
+
+      new_err = err.class.new(msg)
+      new_err.set_backtrace(caller)
+      Kernel.raise new_err
+    end
+  end
+
+end

data/lib/wx/rtc/symbol_picker_dialog.rb

@@ -0,0 +1,47 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+class Wx::RTC::SymbolPickerDialog
+
+  # special handling for keyword ctor extension here
+  # as this class deviates from 'normal' window ctors
+  Wx::define_keyword_ctors(Wx::RTC::SymbolPickerDialog) do
+    wx_ctor_params :id, :caption => 'Symbols'
+    wx_ctor_params :pos, :size => [400,300]
+    wx_ctor_params :style => Wx::DEFAULT_DIALOG_STYLE|Wx::RESIZE_BORDER|Wx::CLOSE_BOX
+  end
+
+  # now redefine the overridden ctor to account for deviating arglist
+  def initialize(symbol, initialFont, normalTextFont, parent = nil, *mixed_args, &block)
+    real_args = begin
+                  [ symbol, initialFont, normalTextFont, parent ] + self.class.args_as_list(*mixed_args)
+                rescue => err
+                  msg = "Error initializing #{self.inspect}\n"+
+                    " : #{err.message} \n" +
+                    "Provided are #{[ symbol, initialFont, normalTextFont, parent ] + mixed_args} \n" +
+                    "Correct parameters for #{self.class.name}.new are:\n" +
+                    self.class.describe_constructor(
+                      ":symbol => (String)\n:initialFont => (String)\n:normalTextFont => (String)\n:parent => (Wx::Window)\n")
+
+                  new_err = err.class.new(msg)
+                  new_err.set_backtrace(caller)
+                  Kernel.raise new_err
+                end
+    begin
+      pre_wx_kwctor_init(*real_args)
+    rescue => err
+      msg = "Error initializing #{self.inspect}\n"+
+        " : #{err.message} \n" +
+        "Provided are #{real_args} \n" +
+        "Correct parameters for #{self.class.name}.new are:\n" +
+        self.class.describe_constructor(
+          ":symbol => (String)\n:initialFont => (String)\n:normalTextFont => (String)\n:parent => (Wx::Window)\n")
+
+      new_err = err.class.new(msg)
+      new_err.set_backtrace(caller)
+      Kernel.raise new_err
+    end
+  end
+
+end

data/lib/wx/rtc.rb

@@ -1,8 +1,12 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::RTC sub package loader for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 
 require 'wx/core'
+require 'wx/html'
 require 'wx/prt' if Wx.has_feature?(:USE_PRINTING_ARCHITECTURE)
 
 require 'wxruby_rtc'

data/lib/wx/stc/keyword_defs.rb

@@ -1,6 +1,13 @@
+# 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
+
 # = WxSugar - Keyword Constructors Classes
 # Wx::STC sub package for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 Wx::define_keyword_ctors('StyledTextCtrl') do
   wx_ctor_params :id, :pos, :size, :style => 0

data/lib/wx/stc/require.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::STC sub package for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 require_relative './events/evt_list'
 require_relative './keyword_defs'

data/lib/wx/stc.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::STC sub package loader for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 
 require 'wx/core'

data/lib/wx/version.rb

@@ -1,3 +1,7 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 module Wx
-  WXRUBY_VERSION    = '0.9.0-rc.3'
+  WXRUBY_VERSION    = '0.9.1'
 end

data/lib/wx/wxruby/base.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # wxruby command handler base
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 require 'optparse'
 require "rbconfig"

data/lib/wx/wxruby/cmd/sampler.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # wxruby sampler command handler
-# Copyright (c) M.J.N. Corino, The Netherlands
 #--------------------------------------------------------------------
 
 require 'fileutils'

data/lib/wx/wxruby/cmd/test.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # wxruby unit test command handler
-# Copyright (c) M.J.N. Corino, The Netherlands
 #--------------------------------------------------------------------
 
 require 'fileutils'

data/lib/wx.rb

@@ -1,5 +1,8 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx all-in-one loader for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 WX_GLOBAL_CONSTANTS=true unless defined? WX_GLOBAL_CONSTANTS
 

data/rakelib/build.rake

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

data/rakelib/build.rb

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

data/rakelib/config.rake

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 rake file
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './configure'

data/rakelib/configure.rb

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

data/rakelib/doc.rake

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 rake file
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './configure'

data/rakelib/doc.rb

@@ -1,7 +1,11 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 rake doc generation support
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
+
 require_relative './lib/config'
 
 if WXRuby3.is_bootstrapped?

data/rakelib/install.rake

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 rake file
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 namespace :wxruby do

data/rakelib/install.rb

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

data/rakelib/lib/config/cygwin.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 buildtools configuration
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 raise "Cygwin platform is unsupported as yet."

data/rakelib/lib/config/linux.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 buildtools configuration
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './unixish'

data/rakelib/lib/config/macosx.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 buildtools configuration
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './unixish'
@@ -85,7 +88,7 @@ module WXRuby3
           private
 
           def wx_configure
-            bash('./configure --disable-sys-libs --without-liblzma --prefix=`pwd`/install --disable-tests --without-subdirs --disable-debug_info')
+            bash('./configure --disable-optimise --disable-sys-libs --without-liblzma --prefix=`pwd`/install --disable-tests --without-subdirs --disable-debug_info CFLAGS="-Wno-unused-but-set-variable"')
           end
 
           def wx_make
@@ -104,7 +107,7 @@ module WXRuby3
           @ld.sub!(/-o\s*\Z/, '')
 
           @extra_cflags.concat %w[-Wno-unused-function -Wno-conversion-null -Wno-sometimes-uninitialized
-                                  -Wno-overloaded-virtual -Wno-deprecated-copy]
+                                  -Wno-overloaded-virtual -Wno-deprecated-copy -Wno-format-security]
           @extra_cflags << ' -Wno-deprecated-declarations' unless @no_deprecated
 
           # create a .dylib binary

data/rakelib/lib/config/mingw.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 buildtools configuration
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './unixish'

data/rakelib/lib/config/netbsd.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 buildtools configuration
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 raise "NETBSD platform is unsupported as yet."

data/rakelib/lib/config/unixish.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 buildtools configuration
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'set'
@@ -155,17 +158,17 @@ module WXRuby3
           @wx_version  = wx_config('--version')
           @wx_port = case wx_config('--selected-config')
                      when /\Agtk/
-                       :wxGTK
+                       :wxgtk
                      when /\Aqt/
-                       :wxQT
+                       :wxqt
                      when /\Ax11/
-                       :wxX11
+                       :wxx11
                      when /\Amotif/
-                       :wxMOTIF
+                       :wxmotif
                      when /\Amsw/
-                       :wxMSW
+                       :wxmsw
                      when /\Aosx/
-                       :wxOSX
+                       :wxosx
                      else
                        nil
                      end

data/rakelib/lib/config.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 buildtools configuration
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require 'rbconfig'
@@ -189,14 +192,16 @@ module WXRuby3
     private :bash
 
     def test(*tests, **options)
+      errors = 0
       tests = Dir.glob(File.join(Config.instance.test_dir, '*.rb')) if tests.empty?
       tests.each do |test|
         unless File.exist?(test)
           test = File.join(Config.instance.test_dir, test)
           test = Dir.glob(test+'.rb').shift || test unless File.exist?(test)
         end
-        Rake.sh(Config.instance.exec_env, *make_ruby_cmd(test))
+        Rake.sh(Config.instance.exec_env, *make_ruby_cmd(test)) { |ok,status| errors += 1 unless ok }
       end
+      fail "ERRORS: ##{errors} test scripts failed." if errors>0
     end
 
     def irb(**options)

data/rakelib/lib/core/include/enum.inc

@@ -1,5 +1,8 @@
+// Copyright (c) 2023 M.J.N. Corino, The Netherlands
+//
+// This software is released under the MIT license.
+
 // wxRuby3 Wx::Enum class embedded implementation
-// Copyright (c) M.J.N. Corino, The Netherlands
 
 VALUE cWxEnum;