wxruby3 0.9.1 → 0.9.3

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

@@ -0,0 +1,39 @@
+// Copyright (c) 2023 M.J.N. Corino, The Netherlands
+//
+// This software is released under the MIT license.
+
+/*
+ * WxRuby3 wxRubyValidator class
+ */
+
+#ifndef _WXRUBY_VALIDATOR_H
+#define _WXRUBY_VALIDATOR_H
+
+#include "wxruby-ValidatorBinding.h"
+
+class WXRUBY_EXPORT wxRubyValidator : public wxValidator, public wxRubyValidatorBinding
+{
+public:
+  wxRubyValidator ();
+  wxRubyValidator (const wxRubyValidator&);
+  virtual ~wxRubyValidator ();
+
+  virtual wxObject* Clone() const override;
+
+  virtual void SetWindow(wxWindow *win) override;
+
+  virtual bool TransferFromWindow () override;
+  virtual bool TransferToWindow () override;
+
+protected:
+  static WxRuby_ID do_transfer_from_window_id;
+  static WxRuby_ID do_transfer_to_window_id;
+  static WxRuby_ID clone_id;
+
+  virtual VALUE DoTransferFromWindow();
+  virtual bool DoTransferToWindow(VALUE data);
+
+  virtual VALUE get_self() override;
+};
+
+#endif /* _WXRUBY_VALIDATOR_HASH_H */

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

@@ -0,0 +1,64 @@
+// Copyright (c) 2023 M.J.N. Corino, The Netherlands
+//
+// This software is released under the MIT license.
+
+/*
+ * WxRuby3 wxRubyValidatorBinding class
+ */
+
+#ifndef _WXRUBY_VALIDATOR_BINDING_H
+#define _WXRUBY_VALIDATOR_BINDING_H
+
+class WXRUBY_EXPORT wxRubyValidatorBinding
+{
+public:
+  wxRubyValidatorBinding ()
+    : self_(Qnil)
+    , on_transfer_from_win_proc_(Qnil)
+    , on_transfer_to_win_proc_(Qnil)
+  {}
+
+  void SetOnTransferFromWindow(VALUE proc)
+  {
+    this->on_transfer_from_win_proc_ = proc;
+  }
+  void SetOnTransferToWindow(VALUE proc)
+  {
+    this->on_transfer_to_win_proc_ = proc;
+  }
+
+  VALUE DoOnTransferToWindow();
+  bool DoOnTransferFromWindow(VALUE data);
+
+  bool OnTransferFromWindow(VALUE data);
+  VALUE OnTransferToWindow();
+
+  void GC_Mark()
+  {
+    rb_gc_mark(this->on_transfer_from_win_proc_);
+    rb_gc_mark(this->on_transfer_to_win_proc_);
+  }
+
+protected:
+  static WxRuby_ID do_on_transfer_from_window_id;
+  static WxRuby_ID do_on_transfer_to_window_id;
+  static WxRuby_ID call_id;
+
+  wxRubyValidatorBinding (const wxRubyValidatorBinding& vb)
+    : self_(Qnil)
+    , on_transfer_from_win_proc_(vb.on_transfer_from_win_proc_)
+    , on_transfer_to_win_proc_(vb.on_transfer_to_win_proc_)
+  {}
+
+  void CopyBindings(const wxRubyValidatorBinding* val_bind);
+
+  virtual VALUE get_self() = 0;
+
+  VALUE self_;
+
+private:
+  VALUE on_transfer_from_win_proc_;
+  VALUE on_transfer_to_win_proc_;
+};
+
+#endif /* #define _WXRUBY_VALIDATOR_BINDING_H */

data/ext/wxruby3/swig/common.i

@@ -24,7 +24,7 @@
     }
     else
     {
-      rb_raise(swigex.getError(), swigex.what());
+      rb_exc_raise(rb_exc_new_cstr(swigex.getError(), swigex.what()));
     }
   }
   catch (const std::exception& ex) {

data/ext/wxruby3/swig/custom/director.swg

@@ -195,6 +195,14 @@ namespace Swig {
     }
   };
 
+  /* wxRuby customization */
+  class WXRUBY_EXPORT DirectorRubyException : public DirectorException
+  {
+  public:
+    DirectorRubyException(VALUE error, VALUE rcvr, ID fn_id);
+
+  };
+
   /* Simple thread abstraction for pthreads on win32 */
 #ifdef __THREAD__
 # define __PTHREAD__

data/ext/wxruby3/swig/mark_free_impl.i

@@ -309,37 +309,4 @@ WXRUBY_EXPORT void GC_mark_wxFrame(void *ptr)
     std::wcout << "> GC_mark_wxFrame : " << ptr << std::endl;
 #endif
 }
-
-// wxRuby must preserve ruby objects attached as the ClientData of
-// command events that have been user-defined in ruby. Some of the
-// standard wxWidgets CommandEvent classes (which have a constant event
-// id less than wxEVT_USER_FIRST, from wx/event.h) also use ClientData
-// for their own purposes, and this must not be marked as the data is
-// not a ruby object, and will thus crash.
-WXRUBY_EXPORT void GC_mark_wxEvent(void *ptr)
-{
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>1)
-    std::wcout << "> GC_mark_wxEvent : " << ptr << std::endl;
-#endif
-
-  if ( ! ptr ) return;
-  wxEvent* wx_event = (wxEvent*)ptr;
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>2)
-    std::wcout << "* GC_mark_wxEvent(" << ptr << ":{" << wx_event->GetEventType() << "})" << std::endl;
-#endif
-  if ( wx_event->GetEventType() > wxEVT_USER_FIRST &&
-       wx_event->IsCommandEvent() )
-	{
-	  wxCommandEvent* wx_cm_event = (wxCommandEvent*)ptr;
-	  VALUE rb_client_data = (VALUE)wx_cm_event->GetClientData();
-	  rb_gc_mark(rb_client_data);
-	}
-
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>1)
-    std::wcout << "< GC_mark_wxEvent : " <<  ptr << std::endl;
-#endif
-}
 %}

data/lib/wx/aui/aui_tab_ctrl.rb

@@ -0,0 +1,18 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+class Wx::AUI::AuiTabCtrl
+
+  # Convenience method for iterating pages
+  def each_page
+    if block_given?
+      0.upto(get_page_count - 1) do | i |
+        yield get_page(i)
+      end
+    else
+      ::Enumerator.new { |y| each_page { |pg| y << pg } }
+    end
+  end
+
+end

data/lib/wx/aui/auinotebook.rb

@@ -19,8 +19,12 @@ class Wx::AUI::AuiNotebook
 
   # Convenience method for iterating pages
   def each_page
-    0.upto(get_page_count - 1) do | i |
-      yield get_page(i)
+    if block_given?
+      0.upto(get_page_count - 1) do | i |
+        yield get_page(i)
+      end
+    else
+      ::Enumerator.new { |y| each_page { |pg| y << pg } }
     end
   end
 end

data/lib/wx/aui/require.rb

@@ -9,5 +9,6 @@ require_relative './events/evt_list'
 require_relative './auimanager'
 require_relative './auinotebook'
 require_relative './auifloatframe'
+require_relative './aui_tab_ctrl'
 
 Wx::Dialog.setup_dialog_functors(Wx::AUI)

data/lib/wx/core/app.rb

@@ -79,8 +79,8 @@ class Wx::App
   # WxRuby. Such messages usually indicate that the API is being used
   # incorrectly; the file/line reference points to the place in the
   # WxWidgets source code where the assertion was made.
-  define_method(:on_assert_failure) do | file, line, func, condition, message |
-    warn "Wx WARNING: #{message} (#{func}@#{file}:#{line})"
+  def on_assert_failure(file, line, func, condition, message)
+    warn %Q{Wx WARNING: ASSERT #{condition} fired with "#{message}" at (#{func}@#{file}:#{line})}
   end
 
   # For use in development only, of no practical use in production code.

data/lib/wx/core/bitmap_combobox.rb

@@ -8,32 +8,28 @@
 
 module Wx
 
-  class BitmapCombobox < Wx::ComboBox
-
-    # 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.
+  class BitmapComboBox < Wx::ComboBox
 
     wx_append = instance_method :append
-    define_method :append do |item, bitmap=Wx::NULL_BITMAP, data=nil|
-      itm_pos = if data
-                  wx_append.bind(self).call(item, bitmap, data)
-                else
-                  wx_append.bind(self).call(item, bitmap)
-                end
-      client_data_store.insert(itm_pos, data)
-      itm_pos
+    define_method :append do |item, *rest| #bitmap=Wx::NULL_BITMAP, data=nil|
+      if ::Array === item
+        super(item, *rest)
+      elsif rest.empty? || Wx::Bitmap === rest.first
+        wx_append.bind(self).call(item, *rest)
+      else
+        super(item, *rest)
+      end
     end
 
     wx_insert = instance_method :insert
-    define_method :insert do |item, bitmap, pos, data=nil|
-      itm_pos = if data
-                  wx_insert.bind(self).call(item, bitmap, pos, data)
-                else
-                  wx_insert.bind(self).call(item, bitmap, pos)
-                end
-      client_data_store.insert(itm_pos, data)
-      itm_pos
+    define_method :insert do |item, *rest| # bitmap, pos, data=nil|
+      if ::Array === item
+        super(item, *rest)
+      elsif rest.empty? || Wx::Bitmap === rest.first
+        wx_insert.bind(self).call(item, *rest)
+      else
+        super(item, *rest)
+      end
     end
 
   end

data/lib/wx/core/collapsible_pane.rb

@@ -10,7 +10,7 @@
 
 module Wx
 
-  if Wx.has_feature?(:USE_COLLPANE) && (!Wx.has_feature?(:WXGTK20) || Wx.has_feature?(:WXUNIVERSAL))
+  if Wx.has_feature?(:USE_COLLPANE)
     
     GenericCollapsiblePane = CollapsiblePane
     

data/lib/wx/core/combobox.rb

@@ -8,7 +8,17 @@
 
 require_relative './controlwithitems'
 
-class Wx::ComboBox
-  alias :get_item_data :get_client_data
-  alias :set_item_data :set_client_data
+module Wx
+
+  class ComboBox
+
+    # redefine #clear method to take care of client data and to call the proper #clear_items method
+    # (not the #clear method inherited from the TextEntry mixin)
+    wx_clear = instance_method :clear_items
+    define_method :clear do
+      wx_clear.bind(self).call
+    end
+
+  end
+
 end

data/lib/wx/core/controlwithitems.rb

@@ -9,147 +9,59 @@
 # Superclass of a variety of controls that display lists of items (eg
 # Choice, ListBox, CheckListBox)
 
-class Wx::ControlWithItems
+module Wx
 
-  # Make these Ruby enumerables so find, find_all, map etc are available
-  include Enumerable
+  class ControlWithItems
 
-  # 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|
-    itm_pos = -1
-    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
-        if sorted?
-          item.each_with_index do |itm, ix|
-            itm_pos = wx_append.bind(self).call(itm, data[ix])
-            client_data_store.insert(itm_pos, data[ix])
-          end
-        else
-          offs = get_count
-          itm_pos = wx_append.bind(self).call(item)
-          item.size.times { |ix| set_client_data(offs+ix, data[ix]) }
-        end
+    # make sure to honor the inherited common overloads
+    wx_get_client_object = instance_method :get_client_object
+    define_method :get_client_object do |*args|
+      if args.empty?
+        super()
       else
-        itm_pos = wx_append.bind(self).call(item, data)
-        client_data_store.insert(itm_pos, data)
+        wx_get_client_object.bind(self).call(*args)
       end
-    else
-      if ::Array === item
-        if sorted?
-          item.each_with_index do |itm, ix|
-            itm_pos = wx_append.bind(self).call(itm, data[ix])
-            client_data_store.insert(itm_pos, nil)
-          end
-        else
-          itm_pos = wx_append.bind(self).call(item)
-          client_data_store.concat(::Array.new(item.size))
-        end
+    end
+    wx_set_client_object = instance_method :set_client_object
+    define_method :set_client_object do |*args|
+      if args.size < 2
+        super(*args)
       else
-        itm_pos = wx_append.bind(self).call(item)
-        client_data_store.insert(itm_pos, nil)
+        wx_set_client_object.bind(self).call(*args)
       end
     end
-    itm_pos
-  end
+    # redefine aliases
+    alias :client_object :get_client_object
+    alias :client_object= :set_client_object
 
-  wx_insert = instance_method :insert
-  define_method :insert do |item, pos, data=nil|
-    itm_pos = -1
-    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
-        if sorted?
-          item.each_with_index do |itm, ix|
-            itm_pos = wx_insert.bind(self).call(itm, data[ix])
-            client_data_store.insert(itm_pos, data[ix])
-          end
-        else
-          itm_pos = 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]) }
-        end
-      else
-        itm_pos = wx_insert.bind(self).call(item, pos, data)
-        client_data_store.insert(itm_pos, data)
-      end
-    else
-      if ::Array === item
-        if sorted?
-          item.each_with_index do |itm, ix|
-            itm_pos = wx_insert.bind(self).call(itm)
-            client_data_store.insert(itm_pos, nil)
-          end
-        else
-          itm_pos = wx_insert.bind(self).call(item, pos)
-          client_data_store.insert(pos, *::Array.new(item.size))
-        end
+    alias :get_client_data :get_client_object
+    alias :set_client_data :set_client_object
+
+    alias :has_client_data :has_client_object_data
+    alias :has_client_data? :has_client_object_data
+
+    alias :get_item_data :get_client_object
+    alias :set_item_data :set_client_object
+
+    # Overload to provide Enumerator without block
+    wx_each_string = instance_method :each_string
+    define_method :each_string do |&block|
+      if block
+        wx_each_string.bind(self).call(&block)
       else
-        itm_pos = wx_insert.bind(self).call(item, pos)
-        client_data_store.insert(pos, nil)
+        ::Enumerator.new { |y| wx_each_string.bind(self).call { |ln| y << ln } }
       end
     end
-    itm_pos
-  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
-    if data
-      items.each_with_index { |item, ix| set_client_data(item, data[ix]) }
-    end
-  end
+    # define these aliases so controls like ComboBox and OwnerDrawnComboBox and the like all end up with
+    # similar methods
 
-  wx_clear = instance_method :clear
-  define_method :clear do
-    wx_clear.bind(self).call
-    client_data_store.clear
-  end
+    alias :get_list_selection :get_selection
+    alias :set_list_selection :set_selection
+
+    alias :get_list_string_selection :get_string_selection
+    alias :set_list_string_selection :set_string_selection
 
-  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

data/lib/wx/core/enum.rb

@@ -29,11 +29,27 @@ class Wx::Enum
   end
 
   def !
-    self.to_i == 0
+    to_i == 0
+  end
+
+  def allbits?(mask)
+    to_i.allbits?(mask)
+  end
+
+  def anybits?(mask)
+    to_i.anybits?(mask)
+  end
+
+  def nobits?(mask)
+    to_i.nobits?(mask)
   end
 
   def hash
     @value.hash
   end
 
+  def to_s
+    to_i.to_s
+  end
+
 end

data/lib/wx/core/event.rb

@@ -29,7 +29,7 @@ module Wx
     alias :id :get_id
   end
 
-  class Wx::CommandEvent
+  class CommandEvent
 
     # overload the #initialize method to add a check on a
     # correct match between EventType and event class
@@ -43,6 +43,11 @@ module Wx
       end
     end
 
+    alias :set_client_data :set_client_object
+    alias :client_data= :set_client_object
+    alias :get_client_data :get_client_object
+    alias :client_data :get_client_object
+
   end
 
   # reduce mapping warnings for this unpublished event class

data/lib/wx/core/evthandler.rb

@@ -10,6 +10,12 @@
 # EvtHandler. This includes all Wx::Window subclasses and Wx::App.
 
 class Wx::EvtHandler
+
+  alias :set_client_data :set_client_object
+  alias :client_data= :set_client_object
+  alias :get_client_data :get_client_object
+  alias :client_data :get_client_object
+
   # EventType is an internal class that's used to set up event handlers
   # and mappings.
   # * 'name' is the name of the event handler method in ruby
@@ -182,7 +188,7 @@ class Wx::EvtHandler
       # check arity <= 1
       if h_meth.arity>1
         Kernel.raise ArgumentError,
-                     "Event handler should not accept more than at most a single argument"
+                     "Event handler should not accept more than at most a single argument",
                      caller
       end
       # wrap method without any argument in anonymous proc to prevent strict argument checking
@@ -193,7 +199,7 @@ class Wx::EvtHandler
       end
     else
       Kernel.raise ArgumentError,
-                  "Specify event handler with a method, name, proc OR block"
+                  "Specify event handler with a method, name, proc OR block",
                   caller
     end
   end