wxruby3 0.9.0.pre.rc.2 → 0.9.0

data/rakelib/lib/director/aui_toolbar_event.rb

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

data/rakelib/lib/director/aui_toolbar_item.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/banner_window.rb

@@ -0,0 +1,26 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class BannerWindow < Window
+
+      def setup
+        super
+        # not useful in wxRuby with keyword arg support
+        spec.ignore 'wxBannerWindow::wxBannerWindow(wxWindow*,wxDirection)'
+      end
+    end # class BannerWindow
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/bitmap.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -16,7 +19,12 @@ module WXRuby3
         spec.require_app 'wxBitmap',
                          'wxBitmapBundle',
                          'wxMask'
-        spec.ignore 'wxBitmapBundle::FromSVG(char *,const wxSize &)'
+        spec.ignore 'wxBitmapBundle::FromSVG(char*, const wxSize &)', # only need 1 of these; keep the 'const char*'
+                    'wxBitmapBundle::FromSVG(const wxByte *,size_t,const wxSize &)',
+                    'wxBitmapBundle::FromSVGResource',
+                    'wxBitmapBundle::FromResources'
+        # do not support custom impls (for now)
+        spec.ignore 'wxBitmapBundle::FromImpl'
         # not useful in Ruby
         spec.ignore 'wxBitmapBundle::wxBitmapBundle(const char * const *)'
         # disable the wxBitmapBundle typemap for the copy constructor
@@ -44,6 +52,7 @@ module WXRuby3
               SWIG_exception_fail(SWIG_TypeError, "Wrong type for $1_basetype parameter $argnum");
             }
             __CODE
+          map_typecheck precedence: 'POINTER', code: '$1 = (TYPE($input) == T_ARRAY);'
         end
         spec.no_proxy 'wxBitmap'
         # Handler functions are not needed in wxRuby - all standard handlers

data/rakelib/lib/director/bitmap_combobox.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './ctrl_with_items'
@@ -23,6 +26,7 @@ module WXRuby3
                                            wxObject])
         spec.ignore 'wxBitmapComboBox::Insert(const wxString &, const wxBitmap &, unsigned int, wxClientData *)',
                     'wxBitmapComboBox::Append(const wxString &, const wxBitmap &, wxClientData *)'
+        spec.map_apply 'long * OUTPUT' => [ 'long *from', 'long *to' ]
       end
 
     end # class BitmapComboBox

data/rakelib/lib/director/book_ctrls.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -18,6 +21,8 @@ module WXRuby3
         spec.map_apply 'SWIGTYPE *DISOWN' => 'wxWindow* page'
         # but not for const args (query methods)
         spec.map_apply 'SWIGTYPE *' => 'const wxWindow* page'
+        # argout for HitTest
+        spec.map_apply 'long *OUTPUT' => 'long *flags'
 
         case spec.module_name
         when 'wxBookCtrlBase'
@@ -60,8 +65,6 @@ module WXRuby3
           spec.ignore 'wxBookCtrl' # useless define in bookctrl.h doc
           spec.override_inheritance_chain('wxBookCtrlBase', %w[wxControl wxWindow wxEvtHandler wxObject])
           #spec.no_proxy('wxBookCtrlBase')
-          # argout for HitTest
-          spec.map_apply 'long *OUTPUT' => 'long *flags'
           # mixin WithImages
           spec.include_mixin 'wxBookCtrlBase', 'Wx::WithImages'
         when 'wxNotebook'
@@ -73,6 +76,13 @@ module WXRuby3
         when 'wxToolbook', 'wxListbook', 'wxChoicebook', 'wxSimplebook'
           setup_book_ctrl_class(spec.module_name)
           spec.force_proxy(spec.module_name)
+          if spec.module_name == 'wxToolbook'
+            spec.map 'wxToolBarBase *' => 'Wx::ToolBar', swig: false do
+              map_out code: ''
+            end
+            spec.ignore 'wxToolbook::GetToolBar', ignore_doc: false
+            spec.extend_interface 'wxToolbook', 'wxToolBar* GetToolBar() const'
+          end
         when 'wxTreebook'
           setup_book_ctrl_class(spec.module_name)
           spec.force_proxy(spec.module_name)

data/rakelib/lib/director/brush.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/busy_info.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/button.rb

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

data/rakelib/lib/director/calendar_ctrl.rb

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

data/rakelib/lib/director/calendar_date_attr.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/caret.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/check_listbox.rb

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

data/rakelib/lib/director/choice.rb

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

data/rakelib/lib/director/clipboard.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/collapsible_pane.rb

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

data/rakelib/lib/director/collapsible_pane_event.rb

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

data/rakelib/lib/director/colour.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -16,6 +19,11 @@ module WXRuby3
           wxColour::GetPixel wxTransparentColour wxColour::operator!=
           wxBLACK wxBLUE wxCYAN wxGREEN wxYELLOW wxLIGHT_GREY wxRED wxWHITE
           ])
+        spec.map 'unsigned char *' => 'Integer' do
+          map_in temp: 'unsigned char tmp', code: 'tmp = NUM2UINT($input); $1 = &tmp;'
+          map_argout code: '$result = SWIG_Ruby_AppendOutput($result, UINT2NUM(tmp$argnum));'
+          map_typecheck precedence: 'POINTER', code: '$1 = (TYPE($input) == T_FIXNUM);'
+        end
         # rename static method to prevent masking the instance method
         spec.rename_for_ruby 'create_disabled' => 'wxColour::MakeDisabled(unsigned char *r, unsigned char *g, unsigned char *b, unsigned char brightness=255)',
                              # for consistency

data/rakelib/lib/director/colour_picker_ctrl.rb

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

data/rakelib/lib/director/combobox.rb

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

data/rakelib/lib/director/comboctrl.rb

@@ -0,0 +1,94 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class ComboCtrl < Window
+
+      def setup
+        super
+        spec.items << 'wxComboPopup' << 'wxOwnerDrawnComboBox' << 'wxItemContainer'
+        # mixin TextEntry
+        spec.include_mixin 'wxComboCtrl', { 'Wx::TextEntry' => 'wxTextEntryBase' }
+        spec.override_inheritance_chain('wxComboCtrl',
+                                        %w[wxControl
+                                           wxWindow
+                                           wxEvtHandler
+                                           wxObject])
+        spec.regard %w[
+          wxComboCtrl::AnimateShow
+          wxComboCtrl::DoSetPopupControl
+          wxComboCtrl::DoShowPopup
+        ]
+        # turn wxComboPopup into a mixin module
+        spec.make_mixin 'wxComboPopup'
+        # override inheritance chain
+        spec.override_inheritance_chain('wxOwnerDrawnComboBox', %w[wxComboCtrl wxControl wxWindow wxEvtHandler wxObject])
+        spec.fold_bases('wxOwnerDrawnComboBox' => %w[wxItemContainer])
+        spec.regard %w[
+          wxOwnerDrawnComboBox::OnDrawBackground
+          wxOwnerDrawnComboBox::OnDrawItem
+          wxOwnerDrawnComboBox::OnMeasureItem
+          wxOwnerDrawnComboBox::OnMeasureItemWidth
+        ]
+        # unuseful overloads
+        spec.ignore 'wxOwnerDrawnComboBox::wxOwnerDrawnComboBox(wxWindow *, wxWindowID, const wxString &, const wxPoint &, const wxSize &, int, const wxString [], long, const wxValidator &, const wxString &)',
+                    'wxOwnerDrawnComboBox::Create(wxWindow *, wxWindowID, const wxString &, const wxPoint &, const wxSize &, int, const wxString [], long, const wxValidator &, const wxString &)'
+        spec.ignore('wxItemContainer::Append(const wxString &, wxClientData *)',
+                    'wxItemContainer::Append(const std::vector< wxString > &)',
+                    'wxItemContainer::Append(const wxArrayString &, wxClientData **)',
+                    'wxItemContainer::Append(unsigned int, const wxString *)',
+                    'wxItemContainer::Append(unsigned int, const wxString *, void **)',
+                    'wxItemContainer::Append(unsigned int, const wxString *, wxClientData **)',
+                    'wxItemContainer::Insert(const wxString &, unsigned int, wxClientData *)',
+                    'wxItemContainer::Insert(const std::vector< wxString > &)',
+                    'wxItemContainer::Insert(const wxArrayString &, unsigned int, wxClientData **)',
+                    'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int)',
+                    'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int, void **)',
+                    'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int, wxClientData **)',
+                    'wxItemContainer::Set(const std::vector< wxString > &)',
+                    'wxItemContainer::Set(const wxArrayString &, wxClientData **)',
+                    'wxItemContainer::Set(unsigned int, const wxString *)',
+                    'wxItemContainer::Set(unsigned int, const wxString *, void **)',
+                    'wxItemContainer::Set(unsigned int, const wxString *, wxClientData **)',
+                    'wxItemContainer::DetachClientObject',
+                    'wxItemContainer::HasClientObjectData',
+                    'wxItemContainer::GetClientObject',
+                    'wxItemContainer::SetClientObject',
+                    'wxItemContainer::HasClientUntypedData',
+                    'wxItemContainer::Clear')
+        spec.ignore('wxItemContainer::Append(const wxArrayString &, void **)',
+                    'wxItemContainer::Insert(const wxArrayString &, unsigned int, void **)',
+                    'wxItemContainer::Set(const wxArrayString &, void **)', ignore_doc: false)
+        # ambiguous
+        spec.ignore 'wxOwnerDrawnComboBox::IsEmpty', ignore_doc: false
+        # for doc only
+        spec.map 'void** clientData' => 'Array', swig: false do
+          map_in code: ''
+        end
+        spec.ignore(%w[wxItemContainer::GetClientData wxItemContainer::SetClientData], ignore_doc: false) # keep docs
+        # Replace the old Wx definition of this method (which segfaults)
+        # Only need the setter as we cache data in Ruby and the getter
+        # therefor can be pure Ruby
+        spec.add_extend_code 'wxOwnerDrawnComboBox', <<~__HEREDOC
+            VALUE set_client_data(int n, VALUE item_data) {
+              self->SetClientData(n, (void *)item_data);
+              return item_data;
+            }
+        __HEREDOC
+      end
+
+    end # class ComboCtrl
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/config_base.rb

@@ -0,0 +1,135 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+module WXRuby3
+
+  class Director
+
+    class ConfigBase < Director
+
+      def setup
+        super
+        spec.items.clear
+        spec.add_header_code <<~__HEREDOC
+          #include "wxruby-Config.h"
+
+          static const char * __iv_ConfigBase_sc_config = "@config";
+
+          static VALUE config_base_get(int argc, VALUE *argv, VALUE self)
+          {
+            bool autoCreate = true;
+            if (argc > 0)
+            {
+              if (argc > 1)
+              {
+                rb_raise(rb_eArgError, "Expected a single boolean argument");
+                return Qnil;
+              }
+              autoCreate = !(argv[0] == Qfalse || argv[0] == Qnil);
+            }
+
+            VALUE cConfigBase_Singleton = rb_funcall(g_cConfigBase, rb_intern("singleton_class"), 0, 0);
+            VALUE curConfig = rb_iv_get(cConfigBase_Singleton, __iv_ConfigBase_sc_config);
+            // create new config instance if none exists and autoCreate is true
+            if (NIL_P(curConfig) && autoCreate)
+            {
+              // create new ConfigBase instance
+              curConfig = rb_class_new_instance(0, 0, g_cConfig);
+              // set global wxConfigBase instance to a new Ruby Config wrapper
+              wxConfigBase::Set(wxRuby_Ruby2ConfigBase(curConfig));
+              // store global ConfigBase instance as Ruby instance variable of ConfigBase singleton class
+              // (keeps it safe from GC)
+              VALUE cConfigBase_Singleton = rb_funcall(g_cConfigBase, rb_intern("singleton_class"), 0, 0);
+              rb_iv_set(cConfigBase_Singleton, __iv_ConfigBase_sc_config, curConfig);
+            }
+            return curConfig;
+          }
+
+          static VALUE config_base_create(int argc, VALUE *argv, VALUE self)
+          {
+            if (argc>0)
+            {
+              rb_raise(rb_eArgError, "No arguments allowed.");
+              return Qnil;
+            }
+            return config_base_get(0, 0, self);
+          }
+
+          static VALUE config_base_set(int argc, VALUE *argv, VALUE self)
+          {
+            VALUE newCfg = Qnil;
+            if (argc>0)
+            {
+              if (argc > 1)
+              {
+                rb_raise(rb_eArgError, "Expected a single argument.");
+                return Qnil;
+              }
+              newCfg = argv[0];
+              if (!NIL_P(newCfg) && rb_obj_is_kind_of(newCfg, g_cConfig) != Qtrue)
+              {
+                rb_raise(rb_eArgError, "Expected a Wx::Config instance");
+                return Qnil;
+              }
+            }
+
+            // get existing config (if any) 
+            VALUE cConfigBase_Singleton = rb_funcall(g_cConfigBase, rb_intern("singleton_class"), 0, 0);
+            VALUE curConfig = rb_iv_get(cConfigBase_Singleton, __iv_ConfigBase_sc_config);
+            // set new config instance (could be nil)
+            if (!NIL_P(newCfg))
+            {
+              // set global wxConfigBase instance to a (new) Ruby Hash wrapper
+              wxConfigBase::Set(wxRuby_Ruby2ConfigBase(newCfg));
+            }
+            rb_iv_set(cConfigBase_Singleton, __iv_ConfigBase_sc_config, newCfg);
+
+            return curConfig; // return old config (if any)
+          }
+          __HEREDOC
+        spec.add_wrapper_code <<~__HEREDOC
+          SWIGINTERN void 
+          _free_config(void* cfg)
+          {
+            if (cfg)
+            {
+              wxRbHashConfig* config = (wxRbHashConfig*)cfg;
+              delete config;
+            }
+          }
+
+          SWIGINTERN VALUE
+          #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
+          config_allocate(VALUE self)
+          #else
+          config_allocate(int argc, VALUE *argv, VALUE self)
+          #endif
+          {
+            VALUE vresult = Data_Wrap_Struct(g_cConfig, 0, _free_config, 0);
+          #ifndef HAVE_RB_DEFINE_ALLOC_FUNC
+            rb_obj_call_init(vresult, argc, argv);
+          #endif
+            return vresult;
+          }
+          __HEREDOC
+        spec.add_init_code <<~__HEREDOC
+          g_cConfigBase = rb_define_class_under(mWxCore, "ConfigBase", rb_cObject);
+          rb_define_module_function(g_cConfigBase, "create", VALUEFUNC(config_base_create), -1);
+          rb_define_module_function(g_cConfigBase, "get", VALUEFUNC(config_base_get), -1);
+          rb_define_module_function(g_cConfigBase, "set", VALUEFUNC(config_base_set), -1);
+
+          g_cConfig = rb_define_class_under(mWxCore, "Config", g_cConfigBase);
+          rb_define_alloc_func(g_cConfig, config_allocate);
+          __HEREDOC
+      end
+
+    end
+
+  end
+
+end

data/rakelib/lib/director/context_help_button.rb

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

data/rakelib/lib/director/control.rb

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

data/rakelib/lib/director/ctrl_with_items.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 require_relative './window'
@@ -15,6 +18,7 @@ module WXRuby3
         super
         if spec.module_name == 'wxControlWithItems'
           spec.items.replace %w[wxControlWithItems wxItemContainer wxItemContainerImmutable]
+          spec.no_proxy 'wxControlWithItems'
           spec.fold_bases('wxControlWithItems' => %w[wxItemContainer wxItemContainerImmutable])
           spec.override_inheritance_chain('wxControlWithItems',
                                           %w[wxControl

data/rakelib/lib/director/cursor.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3
@@ -17,7 +20,8 @@ module WXRuby3
                          'wxCursor::wxCursor(const wxImage &)',
                          'wxCursor::wxCursor(const char *const *)',
                          'wxCursor::wxCursor(const wxCursor &)'
-        spec.ignore 'wxCursor::wxCursor(const char[],int,int,int,int,const char[])'
+        spec.ignore 'wxCursor::wxCursor(const char[],int,int,int,int,const char[])',
+                    'wxCursor::wxCursor(const char *const *)'
         # ignore stock object (see RubyStockObjects.i)
         spec.ignore %w[wxSTANDARD_CURSOR wxHOURGLASS_CURSOR wxCROSS_CURSOR]
         super

data/rakelib/lib/director/data_format.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/data_object.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3

data/rakelib/lib/director/data_object_simple_base.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 ###
 # wxRuby3 wxWidgets interface director
-# Copyright (c) M.J.N. Corino, The Netherlands
 ###
 
 module WXRuby3