wxruby3 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '079f38ae02dfcba5a96738f73c678e0d9a5396920739cb370c47d79b6bb81adf'
-  data.tar.gz: 510b7637e541b981deb048d4b0aa3898ea8152900b570ead984dcb9c6daee534
+  metadata.gz: c44502717c4bc43863f96c826432224a7cc81063d3768dcffa8a92c7bbead181
+  data.tar.gz: c002fc5f501cba71fa127585102916daca951424e986a265e740e7ca9cbc6e9e
 SHA512:
-  metadata.gz: 4b3c4ad6e1c31636d658cd9f0d986c57caf6bc6f72af19af449b7d371c3b9af45b229533f1ae3593b7c23b2b29bf74dfaac8e88740fcca0699dc093f40b29d8f
-  data.tar.gz: 827044bb4256d7afc741e77209096cd527f2c77688c0b619fd72cf1ad0bf03992de4e3c60ec93e17795835345b15932ae2773381de85177d941d8b205ab120f7
+  metadata.gz: bdd8149612a7ef5637362c5e27a821afe3cd6f1f03c92c00529ab3df12e427a73af97aa1ffa6f89281e7ff259861aed925f3b737ff49bc7564f92b6369b97550
+  data.tar.gz: dcce12022c263d4b5955b2417ab415460f38e5d0418e0c53d64d677c9c9352de5e1ff3b53a7318066b8e8c0b4ff47bf6fefb27ae194e0955801aac0edf99cd59

data/lib/wx/core/enum.rb

@@ -8,6 +8,23 @@
 
 class Wx::Enum
 
+  class << self
+
+    def enumerators
+      self.constants(false).inject({}) do |tbl, cn|
+        cv = self.const_get(cn)
+        tbl[cv.to_i] = cn if self === cv
+        tbl
+      end
+    end
+
+    def [](enum_name)
+      return self.const_get(enum_name) if self.const_defined?(enum_name)
+      nil
+    end
+
+  end
+
   def |(other)
     if other.instance_of?(self.class)
       self.class.new(to_i | other.to_i)
@@ -52,10 +69,10 @@ class Wx::Enum
     return '' if to_i == 0
     enums = []
     mask = to_i
-    self.class.values.each_value do |enum|
-      if enum != 0 && mask.allbits?(enum)
-        enums << enum.to_s
-        mask &= ~enum
+    self.class.enumerators.each_pair do |eval, ename|
+      if eval != 0 && mask.allbits?(eval)
+        enums << ename
+        mask &= ~eval
         break if mask == 0
       end
     end
@@ -65,7 +82,7 @@ class Wx::Enum
   private :bitmask_to_s
 
   def to_s
-    self.class.values.has_key?(to_i) ? "#{self.class.name}::#{self.class.names_by_value[self]}" : bitmask_to_s
+    self.class.enumerators.has_key?(to_i) ? "#{self.class.name}::#{self.class.enumerators[to_i]}" : bitmask_to_s
   end
 
 end

data/lib/wx/core/functions.rb

@@ -13,20 +13,14 @@ module Wx
     # Allow this to be called with keyword parameters, and avoid
     # segfaults on OS X with bad params
     wx_about_box = self.instance_method(:about_box)
-    define_method(:about_box) do | info |
-      # If AboutDialogInfo has no version, it segfaults on OS X 10.5
-      no_version = ArgumentError.new("Must supply a version for AboutDialog")
+    define_method(:about_box) do | info, parent=nil |
       case info
       when Wx::AboutDialogInfo
-        unless info.has_version
-          Kernel.raise no_version 
-        end
-
         ab_info = info
       when Hash
         ab_info = Wx::AboutDialogInfo.new
         ab_info.name    = info[:name] || 'wxRuby application'
-        ab_info.version = info[:version] || Kernel.raise(no_version)
+        ab_info.version = info[:version] if info[:version]
         
         ab_info.description = info[:description] || ''
         ab_info.copyright   = info[:copyright] || ''
@@ -36,7 +30,7 @@ module Wx
         ab_info.artists     = info[:artists] || []
         ab_info.translators = info[:translators] || []
         if info.key?(:website)
-          ab_info.set_website(*info[:website])
+          ab_info.set_web_site(*info[:website])
         end
         if info.key?(:icon)
           ab_info.icon = info[:icon]
@@ -46,7 +40,7 @@ module Wx
         Kernel.raise ArgumentError,
                      "Can't use #{info.inspect} for AboutDialogInfo"
       end
-      wx_about_box.bind(self).call(ab_info)
+      wx_about_box.bind(self).call(ab_info, parent)
     end
   end
 end

data/lib/wx/doc/animation_ctrl.rb

@@ -0,0 +1,18 @@
+# :stopdoc:
+# This file is automatically generated by the WXRuby3 documentation
+# generator. Do not alter this file.
+# :startdoc:
+
+
+module Wx
+
+  class GenericAnimationCtrl < AnimationCtrl
+
+    # This override of {Wx::AnimationCtrl#play} lets you specify if the animation must loop or not.
+    # @param looped [Boolean] default true
+    # @return [Boolean]
+    def play(looped = true) end
+
+  end
+
+end

data/lib/wx/doc/enum.rb

@@ -100,17 +100,6 @@ module Wx
     # of a bitwise **or** expression is returned matching the mask.
     def to_s; end
 
-    # Create a new class and associated enum values.
-    # @param [String,Symbol] name name of new enum class
-    # @param [Hash] enum_values hash with enum value name and enum integer value pairs
-    # @return [Class] new enum class
-    def self.create(name, enum_values) end
-
-    # Returns enum class matching name or nil.
-    # @param [String,Symbol] name name of enum class
-    # @return [Class,nil] enum class
-    def self.[](name) end
-
   end
 
 end

data/lib/wx/keyword_defs.rb

@@ -530,7 +530,13 @@ Wx::define_keyword_ctors(Wx::SearchCtrl) do
 end
 
 Wx::define_keyword_ctors(Wx::AnimationCtrl) do
-  wx_ctor_params :id, :anim
+  wx_ctor_params :id, :anim => Wx::NULL_ANIMATION
+  wx_ctor_params :pos, :size, :style => Wx::AC_DEFAULT_STYLE
+  wx_ctor_params :name => Wx::ANIMATION_CTRL_NAME_STR
+end
+
+Wx::define_keyword_ctors(Wx::GenericAnimationCtrl) do
+  wx_ctor_params :id, :anim => Wx::NULL_ANIMATION
   wx_ctor_params :pos, :size, :style => Wx::AC_DEFAULT_STYLE
   wx_ctor_params :name => Wx::ANIMATION_CTRL_NAME_STR
 end

data/lib/wx/version.rb

@@ -3,5 +3,5 @@
 # This software is released under the MIT license.
 
 module Wx
-  WXRUBY_VERSION    = '1.1.1'
+  WXRUBY_VERSION    = '1.2.1'
 end

data/rakelib/lib/config/unixish.rb

@@ -218,10 +218,6 @@ module WXRuby3
           @ruby_libs <<  "-L#{RB_CONFIG['libdir']}"                       # add ruby lib dir
           # add ruby defined shared ruby lib(s); not any other flags
           @ruby_libs.concat RB_CONFIG['LIBRUBYARG_SHARED'].split(' ').select { |s| s.start_with?('-l')}
-
-          # maintain minimum compatibility with ABI 3.0.1
-          @wx_abi_version = [ @wx_version, "3.0.1" ].min
-          @wx_cppflags << "-DwxABI_VERSION=%s" % @wx_abi_version.tr(".", "0")
         end
       end
     end

data/rakelib/lib/config.rb

@@ -728,10 +728,6 @@ module WXRuby3
             @wx_version || ''
           end
 
-          def wx_abi_version
-            @wx_abi_version || ''
-          end
-
           def mingw?
             @platform == :mingw
           end

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

@@ -16,7 +16,6 @@ static const char * __iv_Enum_sc_enums = "@enums";
 
 // instance variables for derived Enum class singleton classes
 static const char * __iv_enum_klass_values = "@values";   // hash map of all value instances of derived Enum (by integer value)
-static const char * __iv_enum_klass_values_by_name = "@values_by_name";   // hash map of all value instances of derived Enum
 static const char * __iv_enum_klass_name = "@name";       // unscoped name of derived Enum
 
 static VALUE wx_Enum_initialize(int argc, VALUE *argv, VALUE self)
@@ -149,55 +148,10 @@ static VALUE wx_Enum_to_int(int argc, VALUE *argv, VALUE self)
   return rb_iv_get(self, __iv_cEnum_value);
 }
 
-static VALUE wx_Enum_sc_get_enum_class(int argc, VALUE *argv, VALUE self)
-{
-  if ((argc < 1) || (argc > 1))
-  {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)", argc); return Qnil;
-  }
-  return rb_hash_aref(rb_iv_get(cEnum_Singleton, __iv_Enum_sc_enums), rb_to_symbol(argv[0]));
-}
-
-static VALUE wx_Enum_sc_create_enum_class(int argc, VALUE *argv, VALUE self)
-{
-  if ((argc < 2) || (argc > 2))
-  {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)", argc); return Qnil;
-  }
-  VALUE enum_name = rb_to_symbol(argv[0]);
-  if (TYPE(argv[1]) != T_HASH)
-  {
-    VALUE str = rb_inspect(argv[1]);
-    rb_raise(rb_eArgError,
-             "Invalid enum_values; expected Hash but got %s.",
-             StringValuePtr(str));
-    return Qnil;
-  }
-  ID id_new = rb_intern("new");
-  ID id_to_i = rb_intern("to_i");
-  ID id_const_set = rb_intern("const_set");
-  VALUE enum_klass = rb_funcall(rb_cClass, id_new, 1, cWxEnum, 0);
-  VALUE enum_singleton_klass = rb_funcall(enum_klass, rb_intern("singleton_class"), 0, 0);
-  VALUE enum_values = rb_funcall(argv[1], rb_intern("keys"), 0, 0);
-  for (int i=0; i<RARRAY_LEN(enum_values) ;++i)
-  {
-    VALUE enum_value_name = rb_ary_entry(enum_values, i);
-    VALUE enum_value_num = rb_funcall(rb_hash_aref(argv[1], enum_value_name), id_to_i, 0, 0);
-    VALUE enum_value = rb_funcall(enum_klass, id_new, 1, enum_value_num, 0);
-    rb_funcall(enum_klass, id_const_set, 2, enum_value_name, enum_value, 0);
-    rb_hash_aset(rb_iv_get(enum_singleton_klass, __iv_enum_klass_values), enum_value_num, enum_value);
-    rb_hash_aset(rb_iv_get(enum_singleton_klass, __iv_enum_klass_values_by_name), rb_to_symbol(enum_value_name), enum_value);
-  }
-  rb_hash_aset(rb_iv_get(cEnum_Singleton, __iv_Enum_sc_enums), enum_name, enum_klass);
-  return enum_klass;
-}
-
 static void wx_setup_Enum_singleton_class()
 {
   cEnum_Singleton = rb_funcall(cWxEnum, rb_intern("singleton_class"), 0, 0);
   rb_iv_set(cEnum_Singleton, __iv_Enum_sc_enums, rb_hash_new());
-  rb_define_method(cEnum_Singleton, "create", VALUEFUNC(wx_Enum_sc_create_enum_class), -1);
-  rb_define_singleton_method(cWxEnum, "[]", VALUEFUNC(wx_Enum_sc_get_enum_class), -1);
 }
 
 static void wx_define_Enum_class()
@@ -223,44 +177,11 @@ WXRB_EXPORT_FLAG VALUE wxRuby_GetEnumClass(const char* enum_class_name_cstr)
   return rb_hash_aref(enum_hash, rb_str_new2(enum_class_name_cstr));
 }
 
-static VALUE wx_Enum_sc_get_enum_value(int argc, VALUE *argv, VALUE self)
-{
-  if ((argc < 1) || (argc > 1))
-  {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)", argc); return Qnil;
-  }
-  VALUE enum_singleton_klass = rb_funcall(self, rb_intern("singleton_class"), 0, 0);
-  return rb_hash_aref(rb_iv_get(enum_singleton_klass, __iv_enum_klass_values_by_name), rb_to_symbol(argv[0]));
-}
-
-static VALUE wx_Enum_sc_get_enum_values(VALUE self)
-{
-  VALUE enum_singleton_klass = rb_funcall(self, rb_intern("singleton_class"), 0, 0);
-  return rb_iv_get(enum_singleton_klass, __iv_enum_klass_values);
-}
-
-static VALUE wx_Enum_sc_get_enum_values_by_name(VALUE self)
-{
-  VALUE enum_singleton_klass = rb_funcall(self, rb_intern("singleton_class"), 0, 0);
-  return rb_iv_get(enum_singleton_klass, __iv_enum_klass_values_by_name);
-}
-
-static VALUE wx_Enum_sc_get_enum_names_by_value(VALUE self)
-{
-  VALUE enum_singleton_klass = rb_funcall(self, rb_intern("singleton_class"), 0, 0);
-  return rb_funcall(rb_iv_get(enum_singleton_klass, __iv_enum_klass_values_by_name), rb_intern("invert"), 0);
-}
-
 WXRB_EXPORT_FLAG VALUE wxRuby_CreateEnumClass(const char* enum_class_name_cstr)
 {
   VALUE enum_klass = rb_funcall(rb_cClass, rb_intern("new"), 1, cWxEnum, 0);
-  rb_define_singleton_method(enum_klass, "[]", VALUEFUNC(wx_Enum_sc_get_enum_value), -1);
-  rb_define_singleton_method(enum_klass, "values", VALUEFUNC(wx_Enum_sc_get_enum_values), 0);
-  rb_define_singleton_method(enum_klass, "values_by_name", VALUEFUNC(wx_Enum_sc_get_enum_values_by_name), 0);
-  rb_define_singleton_method(enum_klass, "names_by_value", VALUEFUNC(wx_Enum_sc_get_enum_names_by_value), 0);
   VALUE enum_singleton_klass = rb_funcall(enum_klass, rb_intern("singleton_class"), 0, 0);
   rb_iv_set(enum_singleton_klass, __iv_enum_klass_values, rb_hash_new());
-  rb_iv_set(enum_singleton_klass, __iv_enum_klass_values_by_name, rb_hash_new());
   rb_iv_set(enum_singleton_klass, __iv_enum_klass_name, rb_str_new2(enum_class_name_cstr));
   rb_hash_aset(rb_iv_get(cEnum_Singleton, __iv_Enum_sc_enums),
                ID2SYM(rb_intern(enum_class_name_cstr)),
@@ -274,7 +195,6 @@ WXRB_EXPORT_FLAG VALUE wxRuby_AddEnumValue(VALUE enum_klass, const char* enum_va
   VALUE enum_value = rb_funcall(enum_klass, rb_intern("new"), 1, enum_value_num, 0);
   VALUE enum_singleton_klass = rb_funcall(enum_klass, rb_intern("singleton_class"), 0, 0);
   rb_hash_aset(rb_iv_get(enum_singleton_klass, __iv_enum_klass_values), enum_value_num, enum_value);
-  rb_hash_aset(rb_iv_get(enum_singleton_klass, __iv_enum_klass_values_by_name), enum_value_name, enum_value);
   rb_funcall(enum_klass, rb_intern("const_set"), 2, enum_value_name, enum_value, 0);
   return enum_value;
 }

data/rakelib/lib/core/package.rb

@@ -114,11 +114,20 @@ module WXRuby3
         directors.select { |dir| Package.full_docs? || !Config.instance.excluded_module?(dir.spec) }
       end
 
-      def director_for_class(class_name)
-        dir = included_directors.detect { |dir| dir.spec.module_name == class_name || dir.spec.items.include?(class_name) }
-        subpackages.each_value.detect { |spkg| dir = spkg.director_for_class(class_name) } if dir.nil?
-        dependencies.detect { |pkgdep| dir = pkgdep.director_for_class(class_name) } if dir.nil?
-        dir = parent.director_for_class(class_name) if dir.nil? && parent
+      def director_for_class(class_name, pkg_stack=[])
+        dir = included_directors.detect { |dir| dir.spec.module_name == class_name || dir.spec.items.include?(dir.spec.classdef_name(class_name)) }
+        pkg_stack << self
+        subpackages.each_value.detect do |spkg|
+          unless pkg_stack.include?(spkg) # should never happen
+            dir = spkg.director_for_class(class_name, pkg_stack)
+          end
+        end if dir.nil?
+        dependencies.detect do |pkgdep|
+          unless pkg_stack.include?(pkgdep)
+            dir = pkgdep.director_for_class(class_name)
+          end
+        end if dir.nil?
+        dir = parent.director_for_class(class_name) if dir.nil? && parent && !pkg_stack.include?(parent)
         dir
       end
 

data/rakelib/lib/director/animation_ctrl.rb

@@ -18,6 +18,9 @@ module WXRuby3
 
       def setup
         super
+        spec.items << 'wxGenericAnimationCtrl'
+        spec.include 'wx/animate.h'
+        spec.include 'wx/generic/animate.h'
         if Config.instance.wx_version >= '3.3.0'
           spec.items << 'wxAnimationBundle'
           spec.ignore 'wxAnimationBundle::GetAll', ignore_doc: false
@@ -38,6 +41,8 @@ module WXRuby3
             map_out code: ''
           end
         end
+        spec.ignore 'wxGenericAnimationCtrl::Play'
+        spec.extend_interface 'wxGenericAnimationCtrl', 'bool Play(bool looped=true)'
         spec.do_not_generate :variables, :enums, :defines, :functions
       end
     end # class AnimationCtrl

data/rakelib/lib/director/app.rb

@@ -69,7 +69,7 @@ module WXRuby3
           wxExit
         }
         spec.ignore 'wxApp::GetGUIInstance'
-        unless Config.instance.wx_abi_version >= '3.2.1' || Config.instance.wx_version < '3.2.1'
+        unless Config.instance.wx_version < '3.2.1'
           spec.ignore 'wxApp::GTKAllowDiagnosticsControl'
         end
         spec.add_extend_code 'wxApp', <<~__HEREDOC

data/rakelib/lib/director/dragdrop.rb

@@ -43,6 +43,55 @@ module WXRuby3
         spec.add_swig_code '%markfunc wxDropSource "mark_wxDropSource";',
                            '%markfunc wxDropTarget "mark_wxDropTarget";'
         spec.extend_interface 'wxDropSource', 'virtual ~wxDropSource()' # correct interface omission
+        # make Ruby director and wrappers use custom implementation
+        spec.use_class_implementation('wxDropTarget', 'wxRubyDropTarget')
+        spec.make_concrete('wxDropTarget')
+        spec.no_proxy %w[wxDropTarget::OnData]  # prevent director overload; custom impl handles this
+        spec.add_header_code <<~__HEREDOC
+          class wxRubyDropTarget : public wxDropTarget
+          {
+          public:
+            wxRubyDropTarget(wxDataObject *dataObject = nullptr ) : wxDropTarget(dataObject) {} 
+
+            virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult dflt) override
+            {
+              static WxRuby_ID on_data_id("on_data");
+              wxDragResult c_result = wxDragError;
+              VALUE SWIGUNUSED result;
+              
+              VALUE rb_x = INT2NUM(static_cast< int >(x));
+              VALUE rb_y = INT2NUM(static_cast< int >(y));
+              VALUE rb_dflt = wxRuby_GetEnumValueObject("DragResult", static_cast<int>(dflt));
+              if (rb_dflt == Qnil)
+              {
+                std::cerr << "Unexpected argument error: invalid value for Wx::DragResult in wxDropTarget::OnData [" << dflt << "]" << std::endl;
+              }
+              else
+              {
+                VALUE self = SWIG_RubyInstanceFor(this);
+                bool ex = false;
+                result = wxRuby_Funcall(ex, self, rb_intern("on_data"), 3,rb_x, rb_y, rb_dflt);
+                if (ex)
+                {
+                  wxRuby_PrintException(result);
+                }
+                else
+                {
+                  int eval;
+                  if (!wxRuby_GetEnumValue("DragResult", result, eval))
+                  {
+                    std::cerr << "Type Error: invalid value for Wx::DragResult returned from Wx::DropTarget#on_data" << std::endl;
+                  }
+                  else
+                  {
+                    c_result = static_cast<wxDragResult>(eval);
+                  }
+                }
+              }
+              return (wxDragResult) c_result;
+            } 
+          };
+          __HEREDOC
         spec.ignore %w[wxFileDropTarget::OnDrop wxTextDropTarget::OnDrop]
         spec.no_proxy %w[wxFileDropTarget::OnDrop wxFileDropTarget::OnData]
         spec.no_proxy %w[wxTextDropTarget::OnDrop wxTextDropTarget::OnData]

data/rakelib/lib/director/utils.rb

@@ -61,6 +61,9 @@ module WXRuby3
         spec.ignore 'wxGetEmailAddress(char *,int)',
                     'wxGetUserId(char *,int)',
                     'wxGetUserName(char *,int)'
+        if Config.instance.wx_version >= '3.3.0'
+          spec.ignore_unless('WXMSW', 'wxMSWIsOnSecureScreen')
+        end
         spec.map 'wxMemorySize' => 'Integer' do
           map_out code: <<~__CODE
             $result = LL2NUM(wxLongLongNative($1).GetValue());

data/rakelib/lib/generate/doc.rb

@@ -703,7 +703,7 @@ module WXRuby3
         fdoc.puts
         mod_indent = 0
         package.all_modules.each do |modnm|
-          fdoc.iputs("module #{package.fullname}", mod_indent)
+          fdoc.iputs("module #{modnm}", mod_indent)
           fdoc.puts
           mod_indent += 1
         end

data/rakelib/lib/swig_runner.rb

@@ -628,7 +628,12 @@ module WXRuby3
         end
 
         def run
-          member_map = collect_methods rescue $!
+          begin
+            member_map = collect_methods
+          rescue Exception
+            STDERR.puts "#{$!}\n#{$!.backtrace.join("\n")}"
+            exit(1)
+          end
           return if member_map.empty?
 
           # create re match list for class names

data/samples/animate/anitest.rb

@@ -0,0 +1,284 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+#
+# Adapted for wxRuby from wxWidgets widgets sample
+# Copyright (c) 2001 Julian Smart
+
+require 'wx'
+
+module AniTest
+
+  # Define a new frame
+  class MyFrame < Wx::Frame
+
+    module ID
+      include Wx::IDHelper
+
+      PLAY = self.next_id
+      SET_NULL_ANIMATION = self.next_id
+      SET_INACTIVE_BITMAP = self.next_id
+      SET_NO_AUTO_RESIZE = self.next_id
+      SET_BGCOLOR = self.next_id
+      USE_GENERIC = self.next_id
+
+    end
+
+    def initialize(title)
+      super(nil, :title => title, :size => [500, 400], style: Wx::DEFAULT_FRAME_STYLE)
+
+      set_icon(Wx.Icon(:sample, art_path: File.dirname(__dir__)))
+
+      # Make a menubar
+      file_menu = Wx::Menu.new
+
+      if Wx.has_feature?(:USE_FILEDLG)
+        file_menu.append(Wx::ID_OPEN, "&Open Animation...\tCtrl+O", 'Loads an animation')
+      end # USE_FILEDLG
+      file_menu.append(Wx::ID_EXIT)
+
+      play_menu = Wx::Menu.new
+      play_menu.append(ID::PLAY, "Play\tCtrl+P", "Play the animation")
+      play_menu.append(Wx::ID_STOP, "Stop\tCtrl+S", "Stop the animation")
+      play_menu.append_separator
+      play_menu.append(ID::SET_NULL_ANIMATION, "Set null animation",
+                       "Sets the empty animation in the control")
+      play_menu.append_check_item(ID::SET_INACTIVE_BITMAP, "Set inactive bitmap",
+                                  "Sets an inactive bitmap for the control")
+      play_menu.append_check_item(ID::SET_NO_AUTO_RESIZE, "Set no autoresize",
+                                  "Tells the control not to resize automatically")
+      play_menu.append(ID::SET_BGCOLOR, "Set background colour...",
+                       "Sets the background colour of the control")
+
+      if Wx::PLATFORM == 'WXGTK'
+        play_menu.append_separator
+        play_menu.append_check_item(ID::USE_GENERIC, "Use &generic animation\tCtrl+G",
+                                    "Selects whether native or generic version is used")
+      end
+
+      help_menu = Wx::Menu.new
+      help_menu.append(Wx::ID_ABOUT)
+
+      menu_bar = Wx::MenuBar.new
+
+      menu_bar.append(file_menu, "&File")
+      menu_bar.append(play_menu, "&Animation")
+      menu_bar.append(help_menu, "&Help")
+
+      # Associate the menu bar with this frame
+      set_menu_bar(menu_bar)
+
+      if Wx.has_feature?(:USE_STATUSBAR)
+        create_status_bar
+      end # USE_STATUSBAR
+
+      # use a Wx::BoxSizer otherwise Wx::Frame will automatically
+      # resize the @animation_ctrl to fill its client area on
+      # user resizes
+      sz = Wx::VBoxSizer.new
+      sz.add(Wx::StaticText.new(self, Wx::ID_ANY, "wxAnimationCtrl:"),
+             Wx::SizerFlags.new.centre.border)
+
+      @animation_ctrl = Wx::AnimationCtrl.new(self, Wx::ID_ANY)
+
+      animations = Wx::AnimationBundle.new
+
+      throbber = Wx::Animation.new(File.join(__dir__, 'throbber.gif'))
+      animations.add(throbber) if throbber.ok?
+
+      throbber2x = Wx::Animation.new(File.join(__dir__, 'throbber_2x.gif'))
+      animations.add(throbber2x) if throbber2x.ok?
+
+      if animations.ok?
+        @animation_ctrl.set_animation(animations)
+        @animation_ctrl.play
+      end
+
+      sz.add(@animation_ctrl, Wx::SizerFlags.new.centre.border)
+      set_sizer(sz)
+
+      evt_menu(ID::PLAY, :on_play)
+      evt_menu(ID::SET_NULL_ANIMATION, :on_set_null_animation)
+      evt_menu(ID::SET_INACTIVE_BITMAP, :on_set_inactive_bitmap)
+      evt_menu(ID::SET_NO_AUTO_RESIZE, :on_set_no_auto_resize)
+      evt_menu(ID::SET_BGCOLOR, :on_set_bg_color)
+      if Wx::PLATFORM == 'WXGTK'
+        evt_menu(ID::USE_GENERIC, :on_use_generic)
+      end
+
+      evt_menu(Wx::ID_STOP, :on_stop)
+      evt_menu(Wx::ID_ABOUT, :on_about)
+      evt_menu(Wx::ID_EXIT, :on_quit)
+      if Wx.has_feature?(:USE_FILEDLG)
+        evt_menu(Wx::ID_OPEN, :on_open)
+      end # USE_FILEDLG
+
+      evt_size { self.layout }
+      evt_update_ui(Wx::ID_ANY, :on_update_ui)
+    end
+
+    def on_about(_event)
+      info = Wx::AboutDialogInfo.new
+      info.set_name("Wx::AnimationCtrl and Wx::Animation sample")
+      info.set_description("This sample program demonstrates the usage of Wx::AnimationCtrl")
+      info.set_copyright("(C) 2024 Martin Corino (original (C) 2006 Julian Smart)")
+
+      info.add_developer("Martin Corino")
+
+      Wx.about_box(info, self)
+    end
+
+    def on_quit(_event)
+      close
+    end
+
+    def on_play(_event)
+      Wx.log_error('Invalid animation') unless @animation_ctrl.play
+    end
+
+    def on_set_null_animation(_event)
+      @animation_ctrl.set_animation(Wx::AnimationBundle.new(Wx::NULL_ANIMATION))
+    end
+
+    def on_set_inactive_bitmap(event)
+      if event.checked?
+        # set a dummy bitmap as the inactive bitmap
+        bmp = Wx::ArtProvider.get_bitmap(Wx::ART_MISSING_IMAGE)
+        @animation_ctrl.set_inactive_bitmap(bmp)
+      else
+        @animation_ctrl.set_inactive_bitmap(Wx::NULL_BITMAP)
+      end
+    end
+
+    def on_set_no_auto_resize(event)
+      # recreate the control with the new flag if necessary
+      style = Wx::AC_DEFAULT_STYLE | (event.checked? ? Wx::AC_NO_AUTORESIZE : 0)
+
+      recreate_animation(style) if style != @animation_ctrl.get_window_style
+    end
+
+    def on_set_bg_color(_event)
+      clr = Wx.get_colour_from_user(self, @animation_ctrl.get_background_colour,
+                                    'Choose the background colour')
+
+      @animation_ctrl.set_background_colour(clr) if clr.ok?
+    end
+
+    def on_stop(_event)
+      @animation_ctrl.stop
+    end
+
+    if Wx::PLATFORM == 'WXGTK'
+
+      def on_use_generic(_event)
+        recreate_animation(@animation_ctrl.get_window_style)
+      end
+
+    end
+
+    def on_update_ui(_event)
+      get_menu_bar.find_item(Wx::ID_STOP).first.enable(@animation_ctrl.playing?)
+      get_menu_bar.find_item(ID::PLAY).first.enable(!@animation_ctrl.playing?)
+      get_menu_bar.find_item(ID::SET_NO_AUTO_RESIZE).first.enable(!@animation_ctrl.playing?)
+    end
+
+    if Wx.has_feature?(:USE_FILEDLG)
+
+      def on_open(_event)
+        Wx.FileDialog(self, "Please choose an animation", '', '', '*.gif;*.ani', Wx::FD_OPEN) do |dialog|
+          if dialog.show_modal == Wx::ID_OK
+              filename = dialog.get_path
+
+              temp = @animation_ctrl.create_animation
+              unless temp.load_file(filename)
+                Wx.log_error("Sorry, this animation is not a valid format for Wx::Animation.")
+                return
+              end
+
+              @animation_ctrl.set_animation(Wx::AnimationBundle.new(temp))
+              @animation_ctrl.play
+
+              get_sizer.layout
+          end
+        end
+      end
+
+    end # USE_FILEDLG
+
+    private
+
+    def recreate_animation(style) 
+      # save status of the control before destroying it
+  
+      # We can't reuse the existing animation if we're switching from native to
+      # generic control or vice versa (as indicated by the absence of change in
+      # the style, which is the only other reason we can get called). We could
+      # save the file name we loaded it from and recreate it, of course, but for
+      # now, for simplicity, just start without any animation in this case.
+      curr = Wx::Animation.new
+      if Wx::PLATFORM == 'WXGTK'
+        curr = @animation_ctrl.get_animation if style != @animation_ctrl.get_window_style
+      end
+  
+      inactive = @animation_ctrl.get_inactive_bitmap
+      bg = @animation_ctrl.get_background_colour
+  
+      # destroy & rebuild
+      old = @animation_ctrl
+  
+      if Wx::PLATFORM == 'WXGTK' && get_menu_bar.is_checked(ID::USE_GENERIC)
+        @animation_ctrl = Wx::GenericAnimationCtrl.new(self, Wx::ID_ANY, curr, style: style)
+      else
+        @animation_ctrl = Wx::AnimationCtrl.new(self, Wx::ID_ANY, curr, style: style)
+      end
+  
+      get_sizer.replace(old, @animation_ctrl)
+
+      # load old status in new control
+      @animation_ctrl.set_inactive_bitmap(inactive)
+      @animation_ctrl.set_background_colour(bg)
+  
+      get_sizer.layout
+    end
+
+  end
+
+
+  class App < Wx::App
+
+    # this one is called on application startup and is a good place for the app
+    # initialization (doing it here and not in the ctor allows to have an error
+    # return: if OnInit() returns false, the application terminates)
+    def on_init
+      # Create the main frame window
+      frame = MyFrame.new('Animation Demo')
+      frame.show
+    end
+
+  end
+
+end
+
+module AniTestSample
+
+  include WxRuby::Sample if defined? WxRuby::Sample
+
+  def self.describe
+    { file: __FILE__,
+      summary: 'wxRuby AnimationCtrl example.',
+      description: <<~__DESC
+        A Ruby port of the wxWidgets anitest sample which showcases
+        animation controls.
+      __DESC
+    }
+  end
+
+  def self.run
+    execute(__FILE__)
+  end
+
+  if $0 == __FILE__
+    AniTest::App.run
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-13 00:00:00.000000000 Z
+date: 2024-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -239,6 +239,7 @@ files:
 - lib/wx/core/window.rb
 - lib/wx/core/window_update_locker.rb
 - lib/wx/core/xmlresource.rb
+- lib/wx/doc/animation_ctrl.rb
 - lib/wx/doc/app.rb
 - lib/wx/doc/array_ext.rb
 - lib/wx/doc/art_locator.rb
@@ -826,6 +827,11 @@ files:
 - rakelib/yard/yard-relative_markdown_links.rb
 - rakelib/yard/yard/relative_markdown_links.rb
 - rakelib/yard/yard/relative_markdown_links/version.rb
+- samples/animate/anitest.rb
+- samples/animate/hourglass.ani
+- samples/animate/throbber.gif
+- samples/animate/throbber_2x.gif
+- samples/animate/tn_anitest.png
 - samples/art/wxruby-128x128.png
 - samples/art/wxruby-256x256.png
 - samples/art/wxruby-64x64.png
@@ -1191,7 +1197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key: 
 specification_version: 4
 summary: wxWidgets extension for Ruby