wxruby3 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d56d06b3a74584ca43ec7314bc816c34175dbb7c68d722dfb88f2d1702dc295b
-  data.tar.gz: 60d6432e98d834f8eaea4e0e13c8a2bed3fd8a9419cc6331d74c945f9695d223
+  metadata.gz: 4bac7565182a0ae6badaee56d7b323459bdc2b198281a50639fafd6fcb2d2499
+  data.tar.gz: 5dc08857adaf213871ec7fce09117bac4cc19f00cac50638de552dc2219ea803
 SHA512:
-  metadata.gz: ef773e93094cfad19757c3d7ecfed29135d920a9f4e810521eadd6b226b8e13a10a735763853c1061d0256ce5fc84a2d5b0c28810874c99443c2a3e2548b753d
-  data.tar.gz: 92df4dfe100a6ec2c4353451d237a1a1819ac2777ac1fdbc9a4a8e6cb4996e8fc3254454582a5465e97c7613eaebca4a29e26935c87286798c24c5d235ef2d36
+  metadata.gz: cbd4920bcc8ae2085ed85b49ee218642c1eb8a58c6bae7132fd653f479e5af6a60c716f61a9ad38bfdcc5cdc1e3560eb4152365127414bf0c401f266b39228c9
+  data.tar.gz: 60bba874185fe173a83d8878e458721a3f3fe58cbf484be2826c100a6009dff062972af7ecbaa9bc7dd3095d100aafdf326ac2dd994e1e50e7939654673d2466

data/ext/wxruby3/swig/common.i

@@ -42,6 +42,14 @@
  * wxWidgets we define our own.
  */
 
+#if defined(__GNUC__)
+#  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#    ifndef GCC_HASCLASSVISIBILITY
+#      define GCC_HASCLASSVISIBILITY
+#    endif
+#  endif
+#endif
+
 #ifndef WXRB_EXPORT_FLAG
 # if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
 #   if defined(WXRUBY_STATIC_BUILD)

data/lib/wx/version.rb

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

data/rakelib/build.rb

@@ -55,8 +55,18 @@ if WXRuby3.is_bootstrapped?
         pkg.generate_initializer
       end
 
-      # Target to run the linker to create a final .so/.dll wxruby3 package library
-      file pkg.lib_target => [*pkg.all_obj_files, *pkg.dep_libs] do | t |
+      # only for MacOSX
+      file pkg.initializer_loader_src => pkg.initializer_src do
+        pkg.generate_initializer_loader
+      end
+
+      # Target to run the linker to create a final wxruby package shared library (MacOSX only)
+      file pkg.shlib_target => [*pkg.all_obj_files, *pkg.dep_libs] do |t|
+        WXRuby3.config.do_shlib_link(pkg)
+      end
+
+      # Target to run the linker to create a final .so/.dll/.bundle wxruby3 package library
+      file pkg.lib_target => pkg.lib_target_deps do | t |
         WXRuby3.config.do_link(pkg)
       end
 

data/rakelib/install.rb

@@ -152,7 +152,10 @@ module WXRuby3
         [File.join(WXRuby3.config.get_cfg_string('siterubyver'), 'wx'), ['lib/wx'], 0644],
       ]
       # add wxRuby shared libraries
-      WXRuby3::Director.each_package { |pkg| specs << [WXRuby3.config.get_cfg_string('siterubyverarch'), [pkg.lib_target], 0555] }
+      WXRuby3::Director.each_package do |pkg|
+        specs << [WXRuby3.config.get_cfg_string('siterubyverarch'), [pkg.lib_target], 0555]
+        specs << [WXRuby3.config.get_cfg_string('siterubyverarch'), [pkg.lib_target.sub(/\.#{WXRuby3.config.dll_ext}\Z/, '.dylib')], 0555] if WXRuby3.config.macosx?
+      end
       if WXRuby3.config.get_config('with-wxwin')
         specs << [WXRuby3.config.get_cfg_string('siterubyverarch'), Install.wxwin_shlibs, 0555]
       end

data/rakelib/lib/config/macosx.rb

@@ -46,6 +46,19 @@ module WXRuby3
           end
           protected :patch_rpath
 
+          # add deployment lookup paths for wxruby shared libraries
+          # and make loadpath for initializer dylibs relative
+          def update_shlib_loadpaths(shlib)
+            # in case of a .bundle library
+            if /\.bundle\Z/ =~ shlib
+              # change the full path of the complementary initializer .dylib to a path relative to any rpath-s
+              dylib = "lib#{File.basename(shlib, '.bundle')}.dylib"
+              dylib_path = File.expand_path(File.join(Config.instance.dest_dir, dylib))
+              sh("install_name_tool -change #{dylib_path} '@rpath/#{dylib}' #{shlib}")
+            end
+            super
+          end
+
           # add Ruby library path for wxruby shared libraries
           def update_shlib_ruby_libpath(shlib)
             # fix lookup for the Ruby shared library
@@ -123,10 +136,23 @@ module WXRuby3
             wx_libset.collect { |s| s.dup }
           end
 
-          def do_link(pkg)
+          def do_shlib_link(pkg)
             objs = pkg.all_obj_files.collect { |o| File.join('..', o) }.join(' ') + ' '
-            sh "cd lib && #{WXRuby3.config.ld} #{WXRuby3.config.ldflags(pkg.lib_target)} #{objs} " +
-                 "#{WXRuby3.config.libs} #{WXRuby3.config.link_output_flag}#{pkg.lib_target}"
+            depsh = pkg.dep_libs.join(' ')
+            ldsh = WXRuby3.config.ld.sub(/-bundle/, '')
+            ldsh.sub!(/-dynamic/, '-dynamiclib')
+            sh "cd lib && " +
+                 "#{ldsh} #{WXRuby3.config.ldflags(pkg.lib_target)} #{objs} #{depsh} " +
+                 "#{WXRuby3.config.libs} #{WXRuby3.config.link_output_flag}#{pkg.shlib_target}",
+               fail_on_error: true
+          end
+
+          def do_link(pkg)
+            sh "cd lib && " +
+                 "#{WXRuby3.config.ld} #{WXRuby3.config.ldflags(pkg.lib_target)} #{File.join('..', pkg.init_obj_file)} " +
+                    "-L. -l#{pkg.libname} " +
+                    "#{WXRuby3.config.libs} #{WXRuby3.config.link_output_flag}#{pkg.lib_target}",
+               fail_on_error: true
           end
 
           private
@@ -151,15 +177,14 @@ module WXRuby3
 
         if @wx_version
           @cpp.sub!(/-std=gnu\+\+11/, '-std=gnu++14')
-          @ld.sub!(/-o\s*\Z/, '')
+          # on Mac OSX this differs from the wxWidgets linking setup
+          @ld = RB_CONFIG['LDSHAREDXX'] || 'g++ -std=gnu++14 -dynamic -bundle'
+          @ld.sub!(/-std=gnu\+\+11/, '-std=gnu++14')
 
           @extra_cflags.concat %w[-Wno-unused-function -Wno-conversion-null -Wno-sometimes-uninitialized
                                   -Wno-overloaded-virtual -Wno-deprecated-copy]
           @extra_cflags << ' -Wno-deprecated-declarations' unless @no_deprecated
 
-          # create a .dylib binary
-          @extra_ldflags << '-dynamic -bundle'
-
           unless @wx_path.empty?
             libdirs = @wx_libs.select {|s| s.start_with?('-L')}.collect {|s| s.sub(/^-L/,'')}
             @exec_env['DYLD_LIBRARY_PATH'] = "#{ENV['DYLD_LIBRARY_PATH']}:#{dest_dir}:#{libdirs.join(':')}"

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/package.rb

@@ -69,6 +69,10 @@ module WXRuby3
         File.join(Config.instance.dest_dir, "#{libname}.#{Config.instance.dll_ext}")
       end
 
+      def shlib_target
+        Config.instance.macosx? ? File.join(Config.instance.dest_dir, "lib#{libname}.dylib") : nil
+      end
+
       def package(pkgname)
         subpackages[pkgname] ||= Package.new(pkgname, self)
       end
@@ -110,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
 
@@ -156,9 +169,30 @@ module WXRuby3
         @all_obj_files
       end
 
+      # only used for MacOSX
+      def init_obj_file
+        if Config.instance.macosx?
+          File.join(Config.instance.obj_dir, "#{libname}_init_loader.#{Config.instance.obj_ext}")
+        else
+          File.join(Config.instance.obj_dir, "#{libname}_init.#{Config.instance.obj_ext}")
+        end
+      end
+
+      def lib_target_deps
+        if Config.instance.macosx?
+          [init_obj_file, shlib_target, *dep_libs]
+        else
+          [*all_obj_files, *dep_libs]
+        end
+      end
+
       def dep_libs
         if parent
-          parent.dep_libs + [File.join(Config.instance.dest_dir, "#{parent.libname}.#{Config.instance.dll_ext}")]
+          parent.dep_libs + if Config.instance.macosx?
+                              [parent.shlib_target]
+                            else
+                              [parent.lib_target]
+                            end
         else
           []
         end
@@ -176,6 +210,11 @@ module WXRuby3
         File.join(Config.instance.src_dir, "#{libname}_init.cpp")
       end
 
+      # only for MacOSX
+      def initializer_loader_src
+        File.join(Config.instance.src_dir, "#{libname}_init_loader.cpp")
+      end
+
       def is_dir_with_fulfilled_deps?(dir, cls_set)
         if (modreg = Spec.module_registry[dir.spec.module_name]) && !modreg.empty?
           # check if all base classes are defined previously or part of the same director or outside the current package
@@ -286,6 +325,14 @@ module WXRuby3
           fsrc.puts '#include <ruby.h>'
           fsrc.puts '#include <ruby/version.h>'
           fsrc.puts <<~__HEREDOC
+            #if defined(__GNUC__)
+            #  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+            #    ifndef GCC_HASCLASSVISIBILITY
+            #      define GCC_HASCLASSVISIBILITY
+            #    endif
+            #  endif
+            #endif
+
             #ifndef WXRB_EXPORT_FLAG
             # if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
             #   if defined(WXRUBY_STATIC_BUILD)
@@ -338,7 +385,11 @@ module WXRuby3
           fsrc.puts '#ifdef __cplusplus'
           fsrc.puts 'extern "C"'
           fsrc.puts '#endif'
-          fsrc.puts "WXRB_EXPORT_FLAG void Init_#{libname}()"
+          if Config.instance.macosx?
+            fsrc.puts "WXRB_EXPORT_FLAG void wxruby_init_#{libname}()"
+          else
+            fsrc.puts "WXRB_EXPORT_FLAG void Init_#{libname}()"
+          end
           fsrc.puts '{'
           fsrc.indent do
             fsrc.puts 'static bool initialized;'
@@ -357,7 +408,7 @@ module WXRuby3
               fsrc << <<~__HERDOC
                 // define Enum class
                 wx_define_Enum_class();
-                __HERDOC
+              __HERDOC
               fsrc.puts
               # generate constant definitions for feature defines from setup.h
               fsrc.puts %Q{VALUE mWxSetup = rb_define_module_under(#{module_variable}, "Setup");}
@@ -391,6 +442,72 @@ module WXRuby3
         generate_event_list if included_directors.any? {|dir| dir.has_events? }
       end
 
+      # only for MacOSX
+      def generate_initializer_loader
+        STDERR.puts "* generating package #{name} initializer : #{initializer_src}" if Director.verbose?
+
+        Stream.transaction do
+          fsrc = CodeStream.new(initializer_loader_src)
+          fsrc.puts '#include <ruby.h>'
+          fsrc.puts '#include <ruby/version.h>'
+          fsrc.puts <<~__HEREDOC
+            #if defined(__GNUC__)
+            #  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+            #    ifndef GCC_HASCLASSVISIBILITY
+            #      define GCC_HASCLASSVISIBILITY
+            #    endif
+            #  endif
+            #endif
+
+            #ifndef WXRB_EXPORT_FLAG
+            # if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+            #   if defined(WXRUBY_STATIC_BUILD)
+            #     define WXRB_EXPORT_FLAG
+            #   else
+            #     define WXRB_EXPORT_FLAG __declspec(dllexport)
+            #   endif
+            # else
+            #   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+            #     define WXRB_EXPORT_FLAG __attribute__ ((visibility("default")))
+            #   else
+            #     define WXRB_EXPORT_FLAG
+            #   endif
+            # endif
+            #endif
+
+            #ifndef WXRB_IMPORT_FLAG
+            # if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+            #   if defined(WXRUBY_STATIC_BUILD)
+            #     define WXRB_IMPORT_FLAG
+            #   else
+            #     define WXRB_IMPORT_FLAG __declspec(dllimport)
+            #   endif
+            # else
+            #   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+            #     define WXRB_IMPORT_FLAG __attribute__ ((visibility("default")))
+            #   else
+            #     define WXRB_IMPORT_FLAG
+            #   endif
+            # endif
+            #endif
+            __HEREDOC
+          fsrc.puts '#ifdef __cplusplus'
+          fsrc.puts 'extern "C"'
+          fsrc.puts '#endif'
+          fsrc.puts "WXRB_IMPORT_FLAG void wxruby_init_#{libname}();"
+          fsrc.puts
+          fsrc.puts '#ifdef __cplusplus'
+          fsrc.puts 'extern "C"'
+          fsrc.puts '#endif'
+          fsrc.puts "WXRB_EXPORT_FLAG void Init_#{libname}()"
+          fsrc.puts '{'
+          fsrc.indent do
+            fsrc.puts "wxruby_init_#{libname}();"
+          end
+          fsrc.puts '}'
+        end
+      end
+
       def extract(*mods, genint: true)
         included_directors.each do |dir|
           dir.extract_interface(genint) if (mods.empty? || mods.include?(dir.spec.name))
@@ -420,11 +537,11 @@ module WXRuby3
                             raise "Don't know Event class for #{evh_name} event type (from #{item.name})"
                           end
             fout.puts '  '+<<~__HEREDOC.split("\n").join("\n  ")
-                      self.register_event_type EventType[
-                          '#{evh_name}', #{evt_arity},
-                          #{fullname}::#{evt_type},
-                          #{fullname}::#{evt_klass.sub(/\Awx/i, '')}
-                        ] if #{fullname}.const_defined?(:#{evt_type})
+              self.register_event_type EventType[
+                  '#{evh_name}', #{evt_arity},
+                  #{fullname}::#{evt_type},
+                  #{fullname}::#{evt_klass.sub(/\Awx/i, '')}
+                ] if #{fullname}.const_defined?(:#{evt_type})
             __HEREDOC
             evts_handled << evh_name
           end
@@ -562,7 +679,7 @@ module WXRuby3
 
               class EvtHandler
 
-            __HEREDOC
+          __HEREDOC
           fdoc.indent(2) do
             fdoc.doc.puts "@!group #{name} Event handler methods"
             fdoc.puts
@@ -651,7 +768,7 @@ module WXRuby3
             
             end
             __HEREDOC
-          __SCRIPT
+        __SCRIPT
         begin
           tmpfile = Tempfile.new('script')
           ftmp_name = tmpfile.path.dup

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/aui_tab_art.rb

@@ -16,6 +16,7 @@ module WXRuby3
         super
         spec.items << 'wxAuiDefaultTabArt' << 'wxAuiSimpleTabArt'
         spec.gc_as_object
+        spec.disable_proxies
         # missing from interface documentation
         spec.extend_interface('wxAuiTabArt',
                               'virtual ~wxAuiTabArt ()',

data/rakelib/lib/director/aui_toolbar_art.rb

@@ -16,7 +16,8 @@ module WXRuby3
         super
         spec.items << 'wxAuiDefaultToolBarArt'
         spec.gc_as_object
-        spec.extend_interface('wxAuiToolBarArt', 'virtual ~wxAuiToolBarArt ()')
+        spec.make_abstract 'wxAuiToolBarArt'
+        spec.disable_proxies
         spec.suppress_warning(473, 'wxAuiToolBarArt::Clone', 'wxAuiDefaultToolBarArt::Clone')
         spec.map 'const wxAuiToolBarItemArray&' => 'Array<Wx::AUI::AuiToolBarItem>,nil' do
           map_in temp: 'wxAuiToolBarItemArray tmp', code: <<~__CODE

data/rakelib/lib/director/dc.rb

@@ -16,6 +16,13 @@ module WXRuby3
 
       def setup
         super
+        _readDC = if Config.instance.wx_version >= '3.3.0'
+                    spec.items.unshift 'wxReadOnlyDC' # prepend before wxDC
+                    spec.items << 'wxInfoDC'
+                    'wxReadOnlyDC'
+                  else
+                    'wxDC'
+                  end
         spec.items << 'wxFontMetrics'
         # it's not safe to track DC objects as these are often created on the stack in C++
         # before being passed to Ruby methods
@@ -29,22 +36,24 @@ module WXRuby3
                     'wxFontMetrics::externalLeading',
                     'wxFontMetrics::averageWidth'
         spec.ignore [
-          'wxDC::GetPartialTextExtents',
-          'wxDC::DrawLines(const wxPointList *,wxCoord,wxCoord)',
-          'wxDC::DrawPolygon(const wxPointList *,wxCoord,wxCoord,wxPolygonFillMode)',
-          'wxDC::DrawSpline(const wxPointList *)',
-          'wxDC::GetLogicalOrigin(wxCoord *,wxCoord *) const',
-          'wxDC::GetHandle'
+                      'wxDC::DrawLines(const wxPointList *,wxCoord,wxCoord)',
+                      'wxDC::DrawPolygon(const wxPointList *,wxCoord,wxCoord,wxPolygonFillMode)',
+                      'wxDC::DrawSpline(const wxPointList *)',
+                      'wxDC::GetHandle'
+                    ]
+        spec.ignore [
+          "#{_readDC}::GetPartialTextExtents",
+          "#{_readDC}::GetLogicalOrigin(wxCoord *,wxCoord *) const",
         ]
+        spec.rename_for_ruby({
+           'GetDimensions' => "#{_readDC}::GetSize(wxCoord *, wxCoord *) const",
+           'GetDimensionsMM' => "#{_readDC}::GetSizeMM(wxCoord *, wxCoord *) const",
+           'GetTextSize' => "#{_readDC}::GetTextExtent(const wxString &) const",
+           'GetMultiLineTextSize' => "#{_readDC}::GetMultiLineTextExtent(const wxString &) const"
+         })
         spec.disable_proxies
         spec.disown 'wxGraphicsContext *ctx'
-        spec.rename_for_ruby({
-          'GetDimensions' => 'wxDC::GetSize(wxCoord *, wxCoord *) const',
-          'GetDimensionsMM' => 'wxDC::GetSizeMM(wxCoord *, wxCoord *) const',
-          'GetTextSize' => 'wxDC::GetTextExtent(const wxString &) const',
-          'GetMultiLineTextSize' => 'wxDC::GetMultiLineTextExtent(const wxString &) const'
-        })
-        spec.add_extend_code 'wxDC', <<~__HEREDOC
+        spec.add_extend_code _readDC, <<~__HEREDOC
           // Needs to return input parameter with list of lengths
           VALUE get_partial_text_extents(VALUE text) {
             wxString str = wxString(StringValuePtr(text), wxConvUTF8);
@@ -57,10 +66,31 @@ module WXRuby3
               }
             return rb_result;
           }
-          __HEREDOC
+        __HEREDOC
         # for GetUserScale and GetLogicalScale
         spec.map_apply 'double * OUTPUT' => 'double *'
         spec.swig_import 'swig/classes/include/wxGDICommon.h'
+        if Config.instance.wx_version >= '3.3.0'
+          # add similar block-style creator as #draw_on methods
+          spec.add_extend_code 'wxInfoDC', <<~__HEREDOC
+            static VALUE inform_on(wxWindow* win)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              if (!win)
+                rb_raise(rb_eRuntimeError, "A running valid Wx::Window is required for argument.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxInfoDC info_dc(win);
+                wxReadOnlyDC* dc_ptr = &info_dc; // wxInfoDC::operator&() returns wxReadOnlyDC*
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(dc_ptr), SWIGTYPE_p_wxInfoDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+          __HEREDOC
+        end
       end
     end # class DC
 

data/rakelib/lib/director/derived_dc.rb

@@ -18,6 +18,7 @@ module WXRuby3
         spec.gc_as_untracked spec.module_name
         case spec.module_name
         when 'wxScreenDC'
+          spec.override_inheritance_chain('wxScreenDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.make_abstract 'wxScreenDC'
           # as a ScreenDC should always be a temporary stack object
           # we do not allow creation in Ruby but rather provide a class
@@ -43,6 +44,7 @@ module WXRuby3
                       'wxScreenDC::EndDrawingOnTop',
                       'wxScreenDC::wxScreenDC'
         when 'wxClientDC'
+          spec.override_inheritance_chain('wxClientDC', ['wxWindowDC', 'wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.make_abstract 'wxClientDC'
           spec.ignore 'wxClientDC::wxClientDC'
           # as a ClientDC should best always be a temporary stack object
@@ -65,6 +67,7 @@ module WXRuby3
             }
           __HEREDOC
         when 'wxPaintDC'
+          spec.override_inheritance_chain('wxPaintDC', ['wxClientDC', 'wxWindowDC', 'wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.make_abstract 'wxPaintDC'
           spec.ignore 'wxPaintDC::wxPaintDC'
           spec.add_header_code <<~__HEREDOC
@@ -89,7 +92,10 @@ module WXRuby3
             __HEREDOC
         when 'wxMemoryDC'
           spec.items << 'wxBufferedDC' << 'wxBufferedPaintDC'
+          spec.override_inheritance_chain('wxMemoryDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.gc_as_untracked %w[wxBufferedDC wxBufferedPaintDC]
+          spec.override_inheritance_chain('wxBufferedDC', ['wxMemoryDC', 'wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
+          spec.override_inheritance_chain('wxBufferedPaintDC', ['wxBufferedDC', 'wxMemoryDC', 'wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.make_abstract 'wxMemoryDC'
           spec.make_abstract 'wxBufferedDC'
           spec.make_abstract 'wxBufferedPaintDC'
@@ -218,6 +224,7 @@ module WXRuby3
             }
           __HEREDOC
         when 'wxMirrorDC'
+          spec.override_inheritance_chain('wxMirrorDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.make_abstract 'wxMirrorDC'
           spec.ignore 'wxMirrorDC::wxMirrorDC'
           # as a MirrorDC should best always be a temporary stack object
@@ -240,6 +247,7 @@ module WXRuby3
             }
           __HEREDOC
         when 'wxSVGFileDC'
+          spec.override_inheritance_chain('wxSVGFileDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.items.concat %w[wxSVGBitmapHandler wxSVGBitmapFileHandler wxSVGBitmapEmbedHandler]
           spec.make_abstract 'wxSVGFileDC'
           spec.ignore 'wxSVGFileDC::wxSVGFileDC'
@@ -277,6 +285,7 @@ module WXRuby3
                       'wxSVGFileDC::StartPage',
                       'wxSVGFileDC::EndPage'
         when 'wxGCDC'
+          spec.override_inheritance_chain('wxGCDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.make_abstract 'wxGCDC'
           spec.ignore 'wxGCDC::wxGCDC'
           # like all DC this should best always be a temporary stack object
@@ -382,7 +391,11 @@ module WXRuby3
           spec.ignore 'wxGCDC::wxGCDC(const wxEnhMetaFileDC &)'
         when 'wxScaledDC'
           spec.items.clear # wxRuby extension; no XML docs
-          spec.override_inheritance_chain('wxScaledDC', %w[wxDC wxObject])
+          if Config.instance.wx_version >= '3.3.0'
+            spec.override_inheritance_chain('wxScaledDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject'])
+          else
+            spec.override_inheritance_chain('wxScaledDC', %w[wxDC wxObject])
+          end
           # as there are no dependencies parsed from XML make sure we're initialized after Wx::DC
           spec.initialize_at_end = true
           spec.no_proxy 'wxScaledDC'
@@ -422,6 +435,7 @@ module WXRuby3
             };
             __HEREDOC
         when 'wxPrinterDC'
+          spec.override_inheritance_chain('wxPrinterDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.make_abstract 'wxPrinterDC'
           spec.ignore 'wxPrinterDC::wxPrinterDC'
           # as a PrinterDC should best always be a temporary stack object
@@ -444,6 +458,7 @@ module WXRuby3
             }
           __HEREDOC
         when 'wxPostScriptDC'
+          spec.override_inheritance_chain('wxPostScriptDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           spec.make_abstract 'wxPostScriptDC'
           spec.ignore 'wxPostScriptDC::wxPostScriptDC'
           # as a PostScriptDC should best always be a temporary stack object
@@ -499,7 +514,44 @@ module WXRuby3
               return rc;
             }
             __HEREDOC
+          if Config.instance.wx_version >= '3.3.0'
+            spec.items << 'wxOverlayDC'
+            spec.override_inheritance_chain('wxOverlayDC', ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject'])
+            spec.make_abstract 'wxOverlayDC'
+            spec.ignore 'wxOverlayDC::wxOverlayDC'
+            spec.add_extend_code 'wxOverlayDC', <<~__HEREDOC
+            static VALUE draw_on(wxOverlay &overlay, wxWindow *win)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxOverlayDC ovl_dc(overlay, win);
+                wxOverlayDC* ovl_dc_ptr = &ovl_dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(ovl_dc_ptr), SWIGTYPE_p_wxOverlayDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+            static VALUE draw_on(wxOverlay &overlay, wxWindow *win, const wxRect &rect)
+            {
+              if (!wxRuby_IsAppRunning()) 
+                rb_raise(rb_eRuntimeError, "A running Wx::App is required.");
+              VALUE rc = Qnil;
+              if (rb_block_given_p ())
+              {
+                wxOverlayDC ovl_dc(overlay, win, rect);
+                wxOverlayDC* ovl_dc_ptr = &ovl_dc;
+                VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(ovl_dc_ptr), SWIGTYPE_p_wxOverlayDC, 0);
+                rc = rb_yield(rb_dc);
+              }
+              return rc;
+            }
+            __HEREDOC
+          end
         else
+          spec.override_inheritance_chain(spec.module_name, ['wxDC', { 'wxReadOnlyDC' => 'wxDC' }, 'wxObject']) if Config.instance.wx_version >= '3.3.0'
           # ctors of all other derived DC require a running App
           spec.require_app spec.module_name
         end

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/ribbon_art_provider.rb

@@ -16,7 +16,9 @@ module WXRuby3
         spec.items << 'wxRibbonPageTabInfo' << 'wxRibbonMSWArtProvider' << 'wxRibbonAUIArtProvider'
         super
         spec.gc_as_object 'wxRibbonArtProvider'
+        spec.make_abstract 'wxRibbonArtProvider'
         spec.gc_as_untracked 'wxRibbonPageTabInfo'
+        spec.disable_proxies
         spec.suppress_warning(473,
                               'wxRibbonArtProvider::Clone',
                               'wxRibbonMSWArtProvider::Clone',

data/rakelib/lib/director/richtext_buffer.rb

@@ -20,6 +20,22 @@ module WXRuby3
         super
         spec.items << 'wxRichTextFontTable' << 'wxRichTextFieldType' << 'wxRichTextFieldTypeStandard' << 'wxRichTextDrawingHandler'
         spec.make_abstract 'wxRichTextFieldType'
+        if Config.instance.wx_version >= '3.3.0'
+          # make Ruby director and wrappers use custom implementation
+          spec.use_class_implementation('wxRichTextFieldType', 'wxRubyRichTextFieldType')
+          spec.add_header_code <<~__HEREDOC
+            class wxRubyRichTextFieldType : public wxRichTextFieldType
+            {
+            public:
+              virtual ~wxRubyRichTextFieldType() {}
+              wxRubyRichTextFieldType(const wxString &name=wxEmptyString) : wxRichTextFieldType(name) {}
+              wxRubyRichTextFieldType(const wxRichTextFieldType &fieldType) : wxRichTextFieldType(fieldType) {}
+              virtual bool Draw(wxRichTextField *, wxDC &, wxRichTextDrawingContext &, const wxRichTextRange &, const wxRichTextSelection &, const wxRect &, int , int ) { return false; }
+              virtual bool Layout(wxRichTextField *, wxReadOnlyDC &, wxRichTextDrawingContext &, const wxRect &, const wxRect &, int) { return false; }
+              virtual bool GetRangeSize(wxRichTextField *, const wxRichTextRange &, wxSize &, int &, wxReadOnlyDC &, wxRichTextDrawingContext &, int, const wxPoint &, const wxSize &, wxArrayInt *) const { return false; }
+            };
+            __HEREDOC
+        end
         spec.no_proxy 'wxRichTextFontTable'
         spec.include 'wx/richtext/richtextstyles.h'
         spec.ignore %w[

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/director/window.rb

@@ -120,6 +120,7 @@ module WXRuby3
           end
           if Config.instance.wx_version >= '3.3.0'
             spec.ignore_unless('WXMSW', 'wxWindow::MSWDisableComposited')
+            spec.ignore('wxWindow::GTKGetWin32Handle')
           end
           if Config.instance.features_set?('USE_ACCESSIBILITY')
             spec.disown 'wxAccessible *accessible'

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-02 00:00:00.000000000 Z
+date: 2024-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -1191,7 +1191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.16
 signing_key: 
 specification_version: 4
 summary: wxWidgets extension for Ruby