wxruby3 0.9.0.pre.beta.9 → 0.9.0.pre.beta.11

data/rakelib/lib/config/mingw.rb

@@ -122,6 +122,9 @@ module WXRuby3
           @rescomp << ' --define __WXMSW__ --define wxUSE_DPI_AWARE_MANIFEST=2 --define wxUSE_RC_MANIFEST=1 --define ISOLATION_AWARE_ENABLED'
           @rescomp << ' --define WXUSINGDLL'
           @extra_cflags << '-DISOLATION_AWARE_ENABLED'
+          if @wx_version >= '3.3.0'
+            @extra_cflags << '-D_UNICODE' << '-DUNICODE'
+          end
         end
       end
       private :init_platform

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

@@ -70,7 +70,7 @@ static void wxRuby_SetActivationContext()
             MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
             (LPTSTR) &lpMsgBuf,
             0, NULL );
-        ::fprintf(stderr, "Error in CreateActCtx : %s\n", lpMsgBuf);
+        std::wcerr << "Error in CreateActCtx : " << lpMsgBuf << std::endl;
         return;
     }
 
@@ -88,7 +88,7 @@ static void wxRuby_SetActivationContext()
             MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
             (LPTSTR) &lpMsgBuf,
             0, NULL );
-        ::fprintf(stderr, "Error in ActivateActCtx : %s\n", lpMsgBuf);
+        std::wcerr << "Error in ActivateActCtx : " << lpMsgBuf << std::endl;
     }
 }
 

data/rakelib/lib/core/package.rb

@@ -208,7 +208,7 @@ module WXRuby3
         # next initialize all modules without classes (keeping only those with classes)
         inc_dirs.select! do |dir|
           modreg = Spec.module_registry[dir.spec.module_name]
-          if modreg.nil? || modreg.empty?
+          if !dir.spec.initialize_at_end && (modreg.nil? || modreg.empty?)
             init = "Init_#{dir.spec.module_name}()"
             decls << "extern \"C\" void #{init};"
             init_fn << "  #{init};"
@@ -222,7 +222,7 @@ module WXRuby3
         cls_set = ::Set.new
         inc_dirs.select! do |dir|
           modreg = Spec.module_registry[dir.spec.module_name]
-          if modreg && !modreg.empty? && modreg.values.all? {|base| base.nil? || modreg.has_key?(base) }
+          if !dir.spec.initialize_at_end && modreg && !modreg.empty? && modreg.values.all? {|base| base.nil? || modreg.has_key?(base) }
             cls_set.merge modreg.keys # remember classes
             init = "Init_#{dir.spec.module_name}()"
             decls << "extern \"C\" void #{init};"
@@ -235,7 +235,7 @@ module WXRuby3
 
         # next initialize all modules with classes depending (bases AND mixins) on classes in any modules already
         # selected until there are no more modules left or none that are left depend on any selected ones
-        while dir_inx = inc_dirs.find_index { |dir| is_dir_with_fulfilled_deps?(dir, cls_set) }
+        while dir_inx = inc_dirs.find_index { |dir| !dir.spec.initialize_at_end && is_dir_with_fulfilled_deps?(dir, cls_set) }
           dir = inc_dirs[dir_inx]
           modreg = Spec.module_registry[dir.spec.module_name]
           cls_set.merge modreg.keys # remember classes

data/rakelib/lib/core/spec.rb

@@ -77,6 +77,7 @@ module WXRuby3
         @post_processors = processors || [:rename, :fixmodule, :fix_protected_access]
         @requirements = [requirements].flatten
         @type_maps = Typemap::Collection.new
+        @initialize_at_end = false
       end
 
       attr_reader :director, :package, :module_name, :name, :items, :folded_bases, :ignores, :regards, :readonly, :contracts, :event_overrides,
@@ -85,6 +86,7 @@ module WXRuby3
                   :runtime_code, :header_code, :wrapper_code, :extend_code, :init_code, :interface_code,
                   :nogen_sections, :post_processors, :requirements, :type_maps
       attr_writer :interface_file
+      attr_accessor :initialize_at_end
 
       def interface_file
         @interface_file || File.join(Config.instance.classes_path, @name + '.i')

data/rakelib/lib/director/ctrl_with_items.rb

@@ -22,23 +22,40 @@ module WXRuby3
                                              wxEvtHandler
                                              wxObject])
           spec.ignore([
+            'wxItemContainer::Append(const wxString &, wxClientData *)',
+            'wxItemContainer::Append(const std::vector< wxString > &)',
+            'wxItemContainer::Append(const wxArrayString &, wxClientData **)',
+            'wxItemContainer::Append(unsigned int, const wxString *)',
+            'wxItemContainer::Append(unsigned int, const wxString *, void **)',
+            'wxItemContainer::Append(unsigned int, const wxString *, wxClientData **)',
+            'wxItemContainer::Insert(const wxString &, unsigned int, wxClientData *)',
             'wxItemContainer::Insert(const std::vector< wxString > &)',
+            'wxItemContainer::Insert(const wxArrayString &, unsigned int, wxClientData **)',
+            'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int)',
+            'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int, void **)',
+            'wxItemContainer::Insert(unsigned int, const wxString *, unsigned int, wxClientData **)',
+            'wxItemContainer::Set(const std::vector< wxString > &)',
+            'wxItemContainer::Set(const wxArrayString &, wxClientData **)',
+            'wxItemContainer::Set(unsigned int, const wxString *)',
+            'wxItemContainer::Set(unsigned int, const wxString *, void **)',
+            'wxItemContainer::Set(unsigned int, const wxString *, wxClientData **)',
+            'wxItemContainer::DetachClientObject',
+            'wxItemContainer::HasClientObjectData',
             'wxItemContainer::GetClientObject',
             'wxItemContainer::SetClientObject'])
+          spec.ignore([
+            'wxItemContainer::Append(const wxArrayString &, void **)',
+            'wxItemContainer::Insert(const wxArrayString &, unsigned int, void **)',
+            'wxItemContainer::Set(const wxArrayString &, void **)'], ignore_doc: false)
+          # for doc only
+          spec.map 'void** clientData' => 'Array', swig: false do
+            map_in code: ''
+          end
           spec.ignore(%w[wxItemContainer::GetClientData wxItemContainer::SetClientData], ignore_doc: false) # keep docs
-          # Replace the old Wx definitions of these methods - which segfault
+          # Replace the old Wx definition of this method (which segfaults)
+          # Only need the setter as we cache data in Ruby and the getter
+          # therefor can be pure Ruby
           spec.add_extend_code('wxControlWithItems', <<~__HEREDOC
-            VALUE get_client_data(int n) {
-              // Avoid an assert failure if no data previously set
-              if ( ! self->HasClientUntypedData() )
-                return Qnil;
-            
-              VALUE returnVal = (VALUE) self->GetClientData(n);
-              if ( ! returnVal )
-                return Qnil;
-              return returnVal;
-            }
-          
             VALUE set_client_data(int n, VALUE item_data) {
               self->SetClientData(n, (void *)item_data);
               return item_data;
@@ -51,13 +68,8 @@ module WXRuby3
       def setup_ctrl_with_items(clsnm)
         # used in GC phase so DO NOT trigger Ruby redirection
         spec.no_proxy "#{clsnm}::GetCount"
-        spec.add_swig_code <<~__HEREDOC
-          // adjust GC marker
-          %markfunc #{clsnm} "GC_mark_wxControlWithItems";
-          __HEREDOC
         spec.add_header_code <<~__HEREDOC
           extern swig_class cWxControlWithItems;
-          WXRUBY_EXPORT void GC_mark_wxControlWithItems(void* ptr);
           __HEREDOC
         spec.no_proxy "#{clsnm}::GetStringSelection"
       end

data/rakelib/lib/director/data_object.rb

@@ -56,9 +56,103 @@ module WXRuby3
         # Once a DataObject has been added, it belongs to the wxDataObjectComposite object,
         # and will be freed by it on destruction.
         spec.disown 'wxDataObjectSimple* dataObject'
+
+        # Add GC management for the DataObjectSimple instances added to a DataObjectComposite instance.
+        spec.add_header_code <<~__HEREDOC
+          #include <vector>
+          #include <map>
+
+          typedef std::vector<VALUE> data_object_list_t;
+          typedef std::map<wxDataObjectComposite*, data_object_list_t> composite_data_object_map_t;
+          static composite_data_object_map_t CompositeDataObject_Map;
+
+          static void wxRuby_markCompositeDataObjects()
+          {
+            composite_data_object_map_t::iterator it;
+            for( it = CompositeDataObject_Map.begin(); it != CompositeDataObject_Map.end(); ++it )
+            {
+              data_object_list_t &do_list = it->second;
+              for (VALUE data_obj : do_list)
+              {
+          #ifdef __WXRB_DEBUG__
+                if (wxRuby_TraceLevel()>1)
+                {
+                  void *c_ptr = (TYPE(data_obj) == T_DATA ? DATA_PTR(data_obj) : 0);
+                  std::wcout << "**** wxRuby_markCompositeDataObjects : " << it->first << "|" << (void*)c_ptr << std::endl;
+                }
+          #endif               
+                rb_gc_mark(data_obj);
+              }
+            }
+          }
+
+          // custom implementation for wxRuby so we can handle de-registering composites
+          class WxRuby_DataObjectComposite : public wxDataObjectComposite
+          {
+          public:
+            WxRuby_DataObjectComposite() : wxDataObjectComposite() {}
+            virtual ~WxRuby_DataObjectComposite()
+            {
+              CompositeDataObject_Map.erase(this);
+            } 
+          };
+          __HEREDOC
+        # install GC marker
+        spec.add_init_code 'wxRuby_AppendMarker(wxRuby_markCompositeDataObjects);'
+        # use custom implementation class
+        spec.use_class_implementation 'wxDataObjectComposite', 'WxRuby_DataObjectComposite'
+
+        # disable generating the default Add method (keep docs)
+        spec.ignore 'wxDataObjectComposite::Add', ignore_doc: false
+        # Add custom Add implementation
+        spec.add_extend_code 'wxDataObjectComposite', <<~__HEREDOC
+          void add(VALUE rb_dataObject, bool preferred=false)
+          {
+            // convert simple object
+            wxDataObjectSimple *simple_do;
+            int res = SWIG_ConvertPtr(rb_dataObject, SWIG_as_voidptrptr(&simple_do), SWIGTYPE_p_wxDataObjectSimple, SWIG_POINTER_DISOWN);
+            if (!SWIG_IsOK(res)) 
+            {
+              rb_raise(rb_eArgError, "Expected Wx::DataObjectSimple for 1");
+            }
+
+            // add new simple instance to registration for this composite
+            CompositeDataObject_Map[$self].push_back(rb_dataObject);
+
+            // add to composite
+            $self->Add(simple_do);
+          }
+          __HEREDOC
+
       end
     end # class DataObject
 
+    def doc_generator
+      DataObjectDocGenerator.new(self)
+    end
+
   end # class Director
 
+  class DataObjectDocGenerator < DocGenerator
+
+    def get_class_doc(clsdef)
+      if clsdef.name == 'wxDataObjectSimple'
+        []
+      else
+        super
+      end
+    end
+    protected :get_class_doc
+
+    def get_method_doc(mtd)
+      if Extractor::MethodDef === mtd && mtd.class_name == 'wxDataObject' && mtd.name == 'GetDataSize'
+        {}
+      else
+        super
+      end
+    end
+    protected :get_method_doc
+
+  end
+
 end # module WXRuby3

data/rakelib/lib/director/data_object_simple_base.rb

@@ -0,0 +1,123 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+module WXRuby3
+
+  class Director
+
+    class DataObjectSimpleBase < Director
+
+      include Typemap::DataFormat
+      include Typemap::DataObjectData
+
+      def setup
+        super
+        spec.items.clear
+        # insert literal code as #gc_as_xx does not work without parsed class items
+        spec.add_swig_code 'GC_MANAGE_AS_OBJECT(wxDataObjectSimpleBase);'
+        spec.initialize_at_end = true
+
+        spec.swig_import 'ext/wxruby3/swig/classes/include/wxDataObject.h'
+
+        spec.add_header_code <<~__HEREDOC
+          class wxDataObjectSimpleBase : public wxDataObjectSimple
+          {
+          public:
+            wxDataObjectSimpleBase(const wxDataFormat &format=wxFormatInvalid)
+              : wxDataObjectSimple(format) {}
+            virtual ~wxDataObjectSimpleBase() { }
+          
+            virtual size_t GetDataSize() const { return _GetDataSize(); }
+            virtual size_t GetDataSize(const wxDataFormat &) const { return _GetDataSize(); }
+            virtual bool GetDataHere(const wxDataFormat &, void *buf) const { return _GetData(buf); }
+            virtual bool GetDataHere(void *data_buffer) const { return _GetData(data_buffer); }
+            virtual bool SetData(const wxDataFormat &, size_t len, const void *buf) { return _SetData(len, buf); }
+            virtual bool SetData(size_t len, const void *buf) { return _SetData(len, buf); }
+          
+          protected:
+            virtual size_t _GetDataSize() const { return 0; }
+            virtual bool _GetData(void *data_buffer) const { return false; }
+            virtual bool _SetData(size_t len, const void *buf) { return false; }
+          };
+          __HEREDOC
+
+        spec.add_interface_code <<~__HEREDOC
+          class wxDataObjectSimpleBase : public wxDataObjectSimple
+          {
+          public:
+            wxDataObjectSimpleBase(const wxDataFormat &format=wxFormatInvalid);
+          
+            virtual void GetAllFormats(wxDataFormat *formats, Direction dir=Get) const;
+            virtual size_t GetFormatCount(Direction dir=Get) const;
+            virtual wxDataFormat GetPreferredFormat(Direction dir=Get) const;
+          
+          protected:
+            virtual size_t _GetDataSize() const;
+            %feature("numoutputs", "0") _GetData;
+            virtual VOID_BOOL _GetData(void *data_buffer) const;
+            virtual bool _SetData(size_t len, const void *buf);
+          };
+          __HEREDOC
+
+        # For wxDataObjectSimpleBase::GetDataHere/_GetData : the ruby method should
+        # return either a string containing the
+        # data, or nil if the data cannot be provided for some reason.
+        spec.map 'void *data_buffer' do
+
+          map_in ignore: true, code: ''
+
+          # "misuse" the 'check' typemap to initialize the ignored argument
+          # since this is inserted after any non-ignored arguments have been converted we can use these
+          # here
+          map_check temp: 'std::unique_ptr<char[]> data_buf, size_t data_size', code: <<~__CODE
+            data_size = arg1->GetDataSize();
+            data_buf = std::make_unique<char[]>(data_size);
+            $1 = data_buf.get ();
+          __CODE
+
+          # ignore C defined return value entirely (also affects directorout)
+          map_out ignore: 'bool'
+
+          map_argout as: {type: 'String', index: 1}, code: <<~__CODE
+            if (result)
+            {
+              $result = rb_utf8_str_new( (const char*)data_buf$argnum.get(), data_size$argnum);
+            }
+            else
+              $result = Qnil;
+          __CODE
+
+          # ignore the buffer pointer for now
+          map_directorin code: ''
+
+          map_directorargout code: <<~__CODE
+            if (RTEST(result))
+            {
+              if (TYPE(result) == T_STRING)
+              {
+                memcpy(data_buffer, StringValuePtr(result), RSTRING_LEN(result) );
+                c_result = true;
+              }
+              else
+              {
+                Swig::DirectorTypeMismatchException::raise(rb_eTypeError, 
+                                                           "get_data_here should return a string, or nil on failure");
+              }
+            }
+            else
+              c_result = false;
+          __CODE
+
+        end
+
+        # Once a DataObject has been added, it belongs to the wxDataObjectComposite object,
+        # and will be freed by it on destruction.
+        # spec.disown 'wxDataObjectSimple* dataObject'
+      end
+    end # class DataObject
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/derived_dc.rb

@@ -52,6 +52,44 @@ module WXRuby3
                       'wxSVGFileDC::EndPage'
         elsif spec.module_name == 'wxGCDC'
           spec.ignore 'wxGCDC::wxGCDC(const wxEnhMetaFileDC &)'
+        elsif spec.module_name == 'wxScaledDC'
+          spec.items.clear # wxRuby extension; no XML docs
+          spec.override_inheritance_chain('wxScaledDC', %w[wxDC wxObject])
+          # as there are no dependencies parsed from XML make sure we're initialized after Wx::DC
+          spec.initialize_at_end = true
+          spec.gc_as_temporary 'wxScaledDC'
+          spec.no_proxy 'wxScaledDC'
+          spec.include 'wxruby-ScaledDC.h'
+          # wxScaledDc should ever only be used in a restricted scope
+          # to be destructed directly after use therefor we make it abstract
+          # and provide a class factory method #draw_on with accepts a block.
+          # (as we there no classes defined in XML we cannot use add_extend_code
+          #  so we use a workaround here)
+          spec.add_swig_code <<~__HEREDOC
+            %extend wxScaledDC {
+            static void draw_on(wxDC& target, double scale)
+            {
+              if (rb_block_given_p())
+              {
+                wxScaledDC scaled_dc(target, scale);
+                wxScaledDC* p_scaled_dc = &scaled_dc;                        
+                VALUE rb_scaled_dc = SWIG_NewPointerObj(SWIG_as_voidptr(p_scaled_dc), SWIGTYPE_p_wxScaledDC, 0);
+                rb_yield(rb_scaled_dc);
+              }
+              return ;
+            }
+            };
+            __HEREDOC
+          spec.swig_import %w[ext/wxruby3/swig/classes/include/wxObject.h
+                              ext/wxruby3/swig/classes/include/wxDC.h]
+          spec.add_interface_code <<~__HEREDOC
+            class wxScaledDC : public wxDC
+            {
+            public:
+              wxScaledDC(wxDC& target, double scale);
+              virtual ~wxScaledDC() = 0;
+            };
+            __HEREDOC
         else
           # ctors of all other derived DC require a running App
           spec.require_app spec.module_name

data/rakelib/lib/director/dialog.rb

@@ -107,72 +107,48 @@ module WXRuby3
           spec.do_not_generate(:functions, :enums, :defines)
         when 'wxDirDialog'
         when 'wxProgressDialog'
-          # These two have problematic arguments; they accept a bool pointer
-          # which will be set to true if "skip" was pressed since the last
-          # update. Dealt with below.
           spec.make_concrete 'wxProgressDialog'
           spec.items << 'wxGenericProgressDialog'
           spec.fold_bases('wxProgressDialog' => 'wxGenericProgressDialog')
-          spec.ignore(%w[wxGenericProgressDialog::Pulse wxGenericProgressDialog::Update], ignore_doc: false) # keep docs
-          # TODO : add docs for Ruby specials
+          if Config.instance.windows?
+            # The native dialog implementation for WXMSW is not usable with wxRuby because
+            # of it's multi-threaded nature so we explicitly use the generic implementation here
+            # (on most or all other platforms that is implicitly so).
+            spec.use_class_implementation 'wxProgressDialog', 'wxGenericProgressDialog'
+          end
+          # These two have problematic arguments; they accept a bool pointer
+          # which will be set to true if "skip" was pressed since the last
+          # update. Dealt with below.
+          spec.ignore(%w[wxGenericProgressDialog::Pulse wxGenericProgressDialog::Update])
           spec.add_extend_code 'wxProgressDialog', <<~__HEREDOC
-            // In wxRuby there are two versions of each of these methods, the
-            // standard one which returns just true/false depending on whether it
-            // has been aborted, and a special one which returns a pair of values,
-            // true/false for "aborted" and then true/false for "skipped"
+            // In wxRuby we change the return value for these methods to be either:
+            // - false if canceled
+            // - true if not canceled nor skipped
+            // - :skipped if skipped
             VALUE pulse(VALUE rb_msg = Qnil)
             {
+              static WxRuby_ID skipped_id("skipped"); 
+
               wxString new_msg;
               if ( rb_msg == Qnil )
                 new_msg = wxEmptyString;
               else
                 new_msg = wxString( StringValuePtr(rb_msg), wxConvUTF8 );
           
-              if ( $self->Pulse(new_msg) )
-                return Qtrue;
-              else
-                return Qfalse;
-            }
-          
-            VALUE pulse_and_check(VALUE rb_msg = Qnil)
-            {
-              VALUE ret = rb_ary_new();
-          
-              wxString new_msg;
-              if ( rb_msg == Qnil )
-                new_msg = wxEmptyString;
-              else
-                new_msg = wxString( StringValuePtr(rb_msg), wxConvUTF8 );
-              
               bool skip = false;
               if ( $self->Pulse(new_msg, &skip) )
-                rb_ary_push(ret, Qtrue);
-              else 
-                rb_ary_push(ret, Qfalse);
-              
-              rb_ary_push(ret, ( skip ? Qtrue : Qfalse) );
-          
-              return ret;
-            }
-          
-            VALUE update(int value, VALUE rb_msg = Qnil)
-            {
-              wxString new_msg;
-              if ( rb_msg == Qnil )
-                new_msg = wxEmptyString;
-              else
-                new_msg = wxString( StringValuePtr(rb_msg), wxConvUTF8 );
-          
-              if ( $self->Update(value, new_msg) )
-                return Qtrue;
+              {
+                if (skip) return ID2SYM(skipped_id());
+                else      return Qtrue;
+              }
               else
                 return Qfalse;
             }
           
-            VALUE update_and_check(int value, VALUE rb_msg = Qnil)
+            VALUE update(int value, VALUE rb_msg = Qnil)
             {
-              VALUE ret = rb_ary_new();
-          
+              static WxRuby_ID skipped_id("skipped");
+ 
               wxString new_msg;
               if ( rb_msg == Qnil )
                 new_msg = wxEmptyString;
@@ -181,13 +157,12 @@ module WXRuby3
           
               bool skip = false;
               if ( $self->Update(value, new_msg, &skip) )
-                rb_ary_push(ret, Qtrue);
-              else 
-                rb_ary_push(ret, Qfalse);
-          
-              rb_ary_push(ret, ( skip ? Qtrue : Qfalse) );
-          
-              return ret;
+              {
+                if (skip) return ID2SYM(skipped_id());
+                else      return Qtrue;
+              }
+              else
+                return Qfalse;
             }
             __HEREDOC
         when 'wxWizard'

data/rakelib/lib/director/image_list.rb

@@ -11,7 +11,9 @@ module WXRuby3
 
       def setup
         spec.require_app 'wxImageList'
-        spec.rename_for_ruby('AddIcon' => 'wxImageList::Add(const wxIcon &)')
+        if Config.instance.windows? || Config.instance.macosx?
+          spec.ignore('wxImageList::Add(const wxIcon &)', ignore_doc: false)
+        end
         super
       end
     end # class ImageList

data/rakelib/lib/director/preview_frame.rb

@@ -13,6 +13,47 @@ module WXRuby3
 
       def setup
         super
+        # we need access to the wxPrintPreview maintained in the frame
+        # for GC marking so define a derived class for that.
+        spec.add_header_code <<~__HEREDOC
+          class WxRubyPreviewFrame : public wxPreviewFrame
+          {
+          public:
+            WxRubyPreviewFrame(wxPrintPreviewBase *preview,
+                               wxWindow *parent,
+                               const wxString& title = wxGetTranslation(wxASCII_STR("Print Preview")),
+                               const wxPoint& pos = wxDefaultPosition,
+                               const wxSize& size = wxDefaultSize,
+                               long style = wxDEFAULT_FRAME_STYLE | wxFRAME_FLOAT_ON_PARENT,
+                               const wxString& name = wxASCII_STR(wxFrameNameStr))
+              : wxPreviewFrame(preview, parent, title, pos, size, style, name)
+            {}
+            virtual ~WxRubyPreviewFrame() {}
+
+            const wxPrintPreview* get_print_preview() const 
+            {
+              return dynamic_cast<const wxPrintPreview*> (this->m_printPreview); 
+            }
+          };
+
+          static void GC_mark_wxPreviewFrame(void *ptr)
+          {
+            if ( GC_IsWindowDeleted(ptr) )
+              return;
+        
+            // Do standard marking routines as for all wxWindows
+            GC_mark_wxWindow(ptr);
+
+            WxRubyPreviewFrame* preview_frame = dynamic_cast<WxRubyPreviewFrame*>((wxPreviewFrame*)ptr);
+            if (preview_frame)
+            {
+              const void* ptr = (const void*)preview_frame->get_print_preview();
+              rb_gc_mark(SWIG_RubyInstanceFor(const_cast<void*> (ptr)));              
+            }
+          }
+        __HEREDOC
+        spec.use_class_implementation 'wxPreviewFrame', 'WxRubyPreviewFrame'
+        spec.add_swig_code '%markfunc wxPreviewFrame "GC_mark_wxPreviewFrame";'
         spec.rename_for_ruby('init' => 'wxPreviewFrame::Initialize')
         # We do not wrap the (undocumented) wxPrintPreviewBase so map this to wxPrintPreview what
         # in all cases will be the actual base being used.

data/rakelib/lib/director/print_data.rb

@@ -15,15 +15,13 @@ module WXRuby3
         spec.disable_proxies # fixed and final data structures
         spec.items << 'wxPrintDialogData' << 'wxPageSetupDialogData'
         spec.ignore 'wxPrintDialogData::SetSetupDialog' # deprecated since 2.5.4
-        # make wxPrintDialogData GC-safe
-        spec.ignore 'wxPrintDialogData::GetPrintData'
-        spec.add_extend_code 'wxPrintDialogData', <<~__HEREDOC
-          wxPrintData* GetPrintData()
-          { return new wxPrintData(self->GetPrintData()); }
-          __HEREDOC
-        spec.new_object 'wxPrintDialogData::GetPrintData'
+        # only keep the const version
         spec.ignore 'wxPageSetupDialogData::GetPrintData'
         spec.regard 'wxPageSetupDialogData::GetPrintData() const'
+        # for GetPrintData methods
+        spec.map 'wxPrintData&' => 'Wx::PrintData' do
+          map_out code: '$result = SWIG_NewPointerObj(SWIG_as_voidptr(new wxPrintData(*$1)), SWIGTYPE_p_wxPrintData, SWIG_POINTER_OWN);'
+        end
         spec.swig_import 'swig/classes/include/wxDefs.h'
       end
     end # class PrintData

data/rakelib/lib/specs/interfaces.rb

@@ -29,6 +29,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxScreenDC', director: Director::DerivedDC)
     Director.Spec(pkg, 'wxSVGFileDC', director: Director::DerivedDC, requirements: %w[wxUSE_SVG])
     Director.Spec(pkg, 'wxGCDC', director: Director::DerivedDC, requirements: %w[wxUSE_GRAPHICS_CONTEXT])
+    Director.Spec(pkg, 'wxScaledDC', director: Director::DerivedDC)
     Director.Spec(pkg, 'wxWindow')
     Director.Spec(pkg, 'wxNonOwnedWindow', director: Director::Window)
     Director.Spec(pkg, 'wxPopupWindow')
@@ -171,6 +172,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxCheckListBox', requirements: %w[wxUSE_CHECKLISTBOX])
     Director.Spec(pkg, 'wxDataFormat', requirements: %w[wxUSE_CLIPBOARD])
     Director.Spec(pkg, 'wxDataObject', requirements: %w[wxUSE_CLIPBOARD])
+    Director.Spec(pkg, 'wxDataObjectSimpleBase', requirements: %w[wxUSE_CLIPBOARD])
     Director.Spec(pkg, 'wxClipboard', requirements: %w[wxUSE_CLIPBOARD])
     Director.Spec(pkg, 'wxDragDrop', requirements: %w[wxUSE_DRAG_AND_DROP])
     Director.Spec(pkg, 'wxContextHelpButton', director: Director::Button, requirements: %w[wxUSE_HELP])

data/rakelib/lib/typemap/data_object_data.rb

@@ -47,7 +47,7 @@ module WXRuby3
           map_argout as: {type: 'String', index: 1}, code: <<~__CODE
             if (result)
             {
-              $result = rb_str_new( (const char*)data_buf$argnum.get(), data_size$argnum);
+              $result = rb_utf8_str_new( (const char*)data_buf$argnum.get(), data_size$argnum);
             }
             else
               $result = Qnil;
@@ -83,11 +83,20 @@ module WXRuby3
         map 'size_t len, const void* buf' do
 
           map_in from: {type: 'String', index: 1}, code: <<~__CODE
-            $1 = RSTRING_LEN($input);
-            $2 = (void*)StringValuePtr($input);
+            if (RTEST($input) && TYPE($input) == T_STRING)
+            {
+              $1 = RSTRING_LEN($input);
+              $2 = (void*)StringValuePtr($input);
+            }
+            else
+            {
+              $1 = 0; $2 = NULL;
+            }
             __CODE
 
-          map_directorin code: '$input = rb_external_str_new( (const char *)buf, len );'
+          map_directorin code: '$input = rb_utf8_str_new( (const char *)buf, len );'
+
+          map_typecheck precedence: 'pointer', code: '$1 = (TYPE($input) == T_STRING);'
         end
 
       end # define