wxruby3 0.9.0.pre.rc.3 → 0.9.0

data/ext/wxruby3/include/wxruby-ScaledDC.h

@@ -1,7 +1,10 @@
+// Copyright (c) 2023 M.J.N. Corino, The Netherlands
+//
+// This software is released under the MIT license.
+
 /*
  * WxRuby3 wxScaledDC class
  * Derived from wxSFScaledDC class in wxShapeFramework library.
- * Copyright (c) M.J.N. Corino, The Netherlands
  */
 /***************************************************************
  * Name:      ScaledDC.h

data/ext/wxruby3/include/wxruby-runtime.h

@@ -1,6 +1,9 @@
+// Copyright (c) 2023 M.J.N. Corino, The Netherlands
+//
+// This software is released under the MIT license.
+
 /*
  * WxRuby3 runtime support
- * Copyright (c) M.J.N. Corino, The Netherlands
  */
 
 #include <memory>
@@ -87,6 +90,12 @@ WXRUBY_EXPORT bool wxRuby_GetEnumValue(const char* enum_class_name_cstr, VALUE r
 WXRUBY_EXPORT bool wxRuby_IsAnEnum(VALUE rb_val);
 WXRUBY_EXPORT bool wxRuby_IsEnumValue(const char* enum_wx_class_name_cstr, VALUE rb_enum_val);
 
+// wxConfigBase helpers
+#include <wx/config.h>
+WXRUBY_EXPORT bool wxRuby_IsRubyConfig(VALUE rbConfig);
+WXRUBY_EXPORT wxConfigBase* wxRuby_Ruby2ConfigBase(VALUE rbHash);
+WXRUBY_EXPORT VALUE wxRuby_ConfigBase2Ruby(wxConfigBase* config);
+
 // Colour type mapping helpers
 WXRUBY_EXPORT bool wxRuby_IsRubyColour(VALUE rbcol);
 WXRUBY_EXPORT wxColour wxRuby_ColourFromRuby(VALUE rbcol);

data/ext/wxruby3/swig/RubyStockObjects.i

@@ -1,6 +1,8 @@
-/* wxRuby3
- * Copyright (c) Martin J.N. Corino
- */
+// 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
 

data/ext/wxruby3/swig/common.i

@@ -1,9 +1,14 @@
-/* wxRuby3
- * Copyright (c) Martin J.N. Corino
- */
+// 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
+ */
+
 %feature("director");
 %feature("compactdefaultargs");
 %feature("flatnested");

data/ext/wxruby3/swig/mark_free_impl.i

@@ -1,7 +1,9 @@
-/* wxRuby3
- * Copyright (c) Martin J.N. Corino
- */
-// Copyright 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
 
 // mark_free_impl.i - this contains the C++ implementation of various

data/ext/wxruby3/swig/memory_management.i

@@ -1,6 +1,8 @@
-/* wxRuby3
- * Copyright (c) Martin J.N. Corino
- */
+// 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
 

data/ext/wxruby3/swig/typedefs.i

@@ -1,6 +1,8 @@
-/* wxRuby3
- * Copyright (c) Martin J.N. Corino
- */
+// 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
 

data/ext/wxruby3/swig/wx.i

@@ -1,3 +1,8 @@
+// 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
 

data/ext/wxruby3/swig/wx.rc

@@ -1,8 +1,10 @@
-/////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2023 M.J.N. Corino, The Netherlands
+//
+// This software is released under the MIT license.
+
 // Name:        swig/wxruby.rc
 // Purpose:     wxRuby3 MSW standard resource file
 // Author:      Martin Corino
-/////////////////////////////////////////////////////////////////////////////
 
 // note that the icon used by the Explorer (i.e. the programs icon) is the
 // first icon in the executable and the icons are sorted both by their order

data/lib/wx/accessors.rb

@@ -1,3 +1,11 @@
+# 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 - Accessors
 #
 # The default WxRuby interface has lots and lots of methods like
@@ -7,7 +15,7 @@
 #  * is_checked()
 #  * can_undo()
 #  * has_style(a_style)
-# 
+#
 # and so on. Methods that retrieve set, or query attributes of an object
 # are more normally in Ruby called simply by the attribute name, or, in
 # other cases, with a predicate method:
@@ -24,7 +32,7 @@
 # automagically creates an alias for every WxRuby instance method that
 # begins with +get_+, +set_+, +is_+, +can_+ and +has_+. Note that if you are calling a
 # 'setter' method on self, you must explicitly send the message to self:
-# 
+#
 #  # set's self size to be 100px by 100px
 #  self.size = Wx::Size.new(100, 100)
 #  # only sets the value of a local variable 'size'

data/lib/wx/aui/auifloatframe.rb

@@ -0,0 +1,20 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+# Advanced User Interface Notebook - draggable panes etc
+
+class Wx::AUI::AuiFloatingFrame
+
+  # Before wxWidgets 3.3 the AUI manager of this control would prevent
+  # WindowDestroyEvent propagation so we 'patch' in a std event handler
+  # that designates the event skipped.
+  if Wx::WXWIDGETS_VERSION < '3.3'
+    wx_initialize = instance_method :initialize
+    define_method :initialize do |*args|
+      wx_initialize.bind(self).call(*args)
+      evt_window_destroy { |evt| evt.skip }
+    end
+  end
+
+end

data/lib/wx/aui/auimanager.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
 
 class Wx::AUI::AuiManager
   def get_all_panes

data/lib/wx/aui/auinotebook.rb

@@ -1,5 +1,22 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Advanced User Interface Notebook - draggable panes etc
+
 class Wx::AUI::AuiNotebook
+
+  # Before wxWidgets 3.3 the AUI manager of this control would prevent
+  # WindowDestroyEvent propagation so we 'patch' in a std event handler
+  # that designates the event skipped.
+  if Wx::WXWIDGETS_VERSION < '3.3'
+    wx_initialize = instance_method :initialize
+    define_method :initialize do |*args|
+      wx_initialize.bind(self).call(*args)
+      evt_window_destroy { |evt| evt.skip }
+    end
+  end
+
   # Convenience method for iterating pages
   def each_page
     0.upto(get_page_count - 1) do | i |

data/lib/wx/aui/require.rb

@@ -1,9 +1,13 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
 # Wx::AUI sub package for wxRuby3
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 #require_relative './ext'
 require_relative './events/evt_list'
 require_relative './auimanager'
 require_relative './auinotebook'
+require_relative './auifloatframe'
 
 Wx::Dialog.setup_dialog_functors(Wx::AUI)

data/lib/wx/aui.rb

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

data/lib/wx/core/acceleratortable.rb

@@ -1,3 +1,11 @@
+# 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
+
 class Wx::AcceleratorTable
   # Allow new to be called as []
   class << self

data/lib/wx/core/animation.rb

@@ -1,3 +1,11 @@
+# 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
+
 class Wx::Animation
   # Redefine the initialize method so it raises an exception if a
   # non-existent file is given to the constructor; otherwise, wx Widgets

data/lib/wx/core/app.rb

@@ -1,3 +1,11 @@
+# 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
+
 # Copyright 2004-2006 by Kevin Smith
 # released under the MIT-style wxruby2 license
 

data/lib/wx/core/array_ext.rb

@@ -1,3 +1,10 @@
+# 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
 
 module Wx
 

data/lib/wx/core/art_locator.rb

@@ -1,3 +1,10 @@
+# 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
 
 module Wx
 

data/lib/wx/core/artprovider.rb

@@ -1,4 +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
+
 # Class which can supply icons and bitmaps
+
 class Wx::ArtProvider
   # Keep a note of supplied ArtProviders to prevent them being GC'd
   @__art_provs = []

data/lib/wx/core/bitmap.rb

@@ -1,4 +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
+
 # A platform-dependent image that can be drawn on the screen
+
 module Wx
 
   if Wx::PLATFORM == 'WXMSW'
@@ -94,10 +103,13 @@ module Wx
     end
   end
 
-  def self.Bitmap(name, bmp_type = nil)
-    art_path = File.dirname(caller_path = caller_locations(1).first.absolute_path || caller_locations(1).first.path)
-    art_owner = File.basename(caller_path, '.*')
-    art_file = ArtLocator.find_art(name, art_type: :bitmap, art_path: art_path, art_section: art_owner, bmp_type: bmp_type)
+  def self.Bitmap(name, bmp_type = nil, art_path: nil, art_section: nil)
+    unless art_path && art_section
+      caller_path = caller_locations(1).first.absolute_path || caller_locations(1).first.path
+      art_path = File.dirname(caller_path) unless art_path
+      art_section = File.basename(caller_path, '.*') unless art_section
+    end
+    art_file = ArtLocator.find_art(name, art_type: :bitmap, art_path: art_path, art_section: art_section, bmp_type: bmp_type)
     ::Kernel.raise ArgumentError, "Cannot locate art file for #{name}:Bitmap" unless art_file
     Bitmap.new(art_file, bmp_type)
   end

data/lib/wx/core/bitmap_combobox.rb

@@ -1,3 +1,10 @@
+# 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
 
 module Wx
 

data/lib/wx/core/brush.rb

@@ -1,3 +1,10 @@
+# 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
 
 module Wx
 

data/lib/wx/core/busycursor.rb

@@ -1,5 +1,14 @@
+# 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
+
 # Emulates the wxWidgets BusyCursor class, by providing a scope within
 # which a busy cursor will be shown
+
 class Wx::BusyCursor
   # Only one class method, optionally accepting a cursor that should be
   # shown, defaulting to an hour glass cursor.

data/lib/wx/core/choice.rb

@@ -1,3 +1,10 @@
+# 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_relative './controlwithitems'
 

data/lib/wx/core/choicedlg.rb

@@ -1,3 +1,10 @@
+# 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
 
 module Wx
 

data/lib/wx/core/clientdc.rb

@@ -1,5 +1,14 @@
+# 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
+
 # Device Context to paint on a window outside an on_paint handler. It is
 # recommended that PaintDC is used in preference to this class.
+
 class Wx::ClientDC
   # This class should not be instantiated directly in wxRuby; it should
   # always be used via Window#paint, which takes a block receiving the

data/lib/wx/core/clipboard.rb

@@ -1,3 +1,11 @@
+# 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
+
 class Wx::Clipboard
   class << self
     # This is provided internally by the SWIG interface file, but all

data/lib/wx/core/collapsible_pane.rb

@@ -1,5 +1,12 @@
+# 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
+
 # WxRuby Extensions - CollapsiblePane platform dependent alias
-# Copyright (c) M.J.N. Corino, The Netherlands
 
 module Wx
 

data/lib/wx/core/colour.rb

@@ -1,3 +1,11 @@
+# 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
+
 class Wx::Colour
   # Redefine the initialize method so it raises an exception if an
   # invalid colour value is given. This might be an unknown colour

data/lib/wx/core/combo_ctrl.rb

@@ -0,0 +1,110 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+module Wx
+  class OwnerDrawnComboBox
+
+    # Make this a Ruby enumerable so find, find_all, map etc are available
+    include Enumerable
+
+    # Passes each valid item index into the passed block
+    def each
+      get_count.times { | i | yield i }
+    end
+
+    # We need to cache client data in Ruby variables as we cannot access items
+    # during the GC mark phase as for some platforms (WXMSW at least) that would
+    # involve calling methods that would break in that phase.
+
+    def client_data_store
+      @client_data ||= []
+    end
+    private :client_data_store
+
+    wx_set_client_data = instance_method :set_client_data
+    define_method :set_client_data do |item, data|
+      item = item.to_i
+      wx_set_client_data.bind(self).call(item, data)
+      client_data_store[item] = data
+    end
+
+    def get_client_data(item)
+      client_data_store[item.to_i]
+    end
+
+    wx_append = instance_method :append
+    define_method :append do |item, data=nil|
+      if data
+        if ::Array === item
+          if !(::Array === data)
+            ::Kernel.raise ::TypeError.new("Expected Array for argument 3")
+          elsif data.size != item.size
+            ::Kernel.raise ::ArgumentError.new("item and data array must be equal size")
+          end
+          offs = get_count
+          wx_append.bind(self).call(item)
+          item.size.times { |ix| set_client_data(offs+ix, data[ix]) }
+        else
+          wx_append.bind(self).call(item, data)
+          client_data_store[get_count-1] = data
+        end
+      else
+        wx_append.bind(self).call(item)
+        # no changes to data store
+      end
+    end
+
+    wx_insert = instance_method :insert
+    define_method :insert do |item, pos, data=nil|
+      if data
+        if ::Array === item
+          if !(::Array === data)
+            ::Kernel.raise ::TypeError.new("Expected Array for argument 3")
+          elsif data.size != item.size
+            ::Kernel.raise ::ArgumentError.new("item and data array must be equal size")
+          end
+          wx_insert.bind(self).call(item, pos)
+          client_data_store.insert(pos, *::Array.new(item.size))
+          item.size.times { |ix| set_client_data(pos+ix, data[ix]) }
+        else
+          wx_insert.bind(self).call(item, pos, data)
+          client_data_store.insert(pos, data)
+        end
+      else
+        wx_insert.bind(self).call(item, pos)
+        if ::Array === item
+          client_data_store.insert(pos, *::Array.new(item.size))
+        else
+          client_data_store.insert(pos, nil)
+        end
+      end
+    end
+
+    wx_set = instance_method :set
+    define_method :set do |items, data=nil|
+      if data
+        if !(::Array === data)
+          ::Kernel.raise ::TypeError.new("Expected Array for argument 2")
+        elsif data.size != items.size
+          ::Kernel.raise ::ArgumentError.new("items and data array must be equal size")
+        end
+      end
+      wx_set.bind(self).call(items)
+      client_data_store.clear
+      items.each_with_index { |item, ix| set_client_data(item, data[ix]) }
+    end
+
+    wx_clear = instance_method :clear
+    define_method :clear do
+      wx_clear.bind(self).call
+      client_data_store.clear
+    end
+
+    wx_delete = instance_method :delete
+    define_method :delete do |item|
+      wx_delete.bind(self).call(item.to_i)
+      client_data_store.slice!(item.to_i)
+    end
+  end
+end

data/lib/wx/core/combobox.rb

@@ -1,3 +1,10 @@
+# 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_relative './controlwithitems'