wxruby3 0.9.0.pre.beta.8 → 0.9.0.pre.beta.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5dbc9b814f9b51ac36a537fad27a58595d41536f68eafb17b7250b70b510d2f
-  data.tar.gz: bd80ce942bd3e37ee334d5562a7fcc4462e640ced3b49449e68e7c9e12f7c784
+  metadata.gz: 392d24963cded73bac9b253b83e6206ed8c1841ea697d6ec0af4d54faaabd79a
+  data.tar.gz: 9715c643d176e5da3c2540f84a2698d551a3cff4d6f28488644d5d9e3d929da3
 SHA512:
-  metadata.gz: 640e90f61107db26bf3f73e76fd5cc05843cc714621773bb807c6f14a4e93b911bb3a92e54f430644843d9c0d986cf8041d9b9ab7750f09f69dbb4517ea8a982
-  data.tar.gz: 5ce36f28a19449a0fd3f20ed5a8133b490335e359f13bb118c325c5592a65f75881f02970a2270699af7d64338d0f06d409d01bd26d4a67c61ed3685d9b71f92
+  metadata.gz: a833c65595d26722ada2368508ed654861f12bb5936fd3b65d29a5a72ce5dcbbc052930bc7a198e4aaba9547d0d3e73facd4a8f995f4cb65ea051c0817c47335
+  data.tar.gz: f95957c8734b5f02f69977b8b937ec304946b4a8f171d40b25c8be7d70b4eae667878d541b76d49b4f2c8895bbebf191ac7e2b813877a3c67ff47f8687c7288f

data/ext/wxruby3/swig/mark_free_impl.i

@@ -340,38 +340,4 @@ WXRUBY_EXPORT void GC_mark_wxEvent(void *ptr)
     std::wcout << "< GC_mark_wxEvent : " <<  ptr << std::endl;
 #endif
 }
-
-// Prevents Ruby's GC sweeping up items that are stored as client data
-// Checks whether the C++ object is still around first...
-WXRUBY_EXPORT void GC_mark_wxControlWithItems(void* ptr)
-{
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>1)
-    std::wcout << "> GC_mark_wxControlWithItems : " << ptr << std::endl;
-#endif
-
-  if ( GC_IsWindowDeleted(ptr) )
-	return;
-
-  GC_mark_wxWindow(ptr);
-
-  wxControlWithItems* wx_cwi = (wxControlWithItems*) ptr;
-  int count = wx_cwi->GetCount();
-  if ( count == 0 )
-	return; // Empty control
-  if ( ! wx_cwi->HasClientObjectData() && ! wx_cwi->HasClientUntypedData() )
-	return; // Control containing only strings
-
-  for (int i = 0; i < count; ++i)
-	{
-	  VALUE object = (VALUE) wx_cwi->GetClientData(i);
-	  if ( object && object != Qnil )
-		rb_gc_mark(object);
-	}
-
-#ifdef __WXRB_DEBUG__
-  if (wxRuby_TraceLevel()>1)
-    std::wcout << "< GC_mark_wxControlWithItems : " << ptr << std::endl;
-#endif
-}
 %}

data/ext/wxruby3/swig/wx.i

@@ -263,7 +263,7 @@ const int wxrb_trace_level = 0;
 #ifdef __WXRB_DEBUG__
 WXRUBY_EXPORT int wxRuby_TraceLevel()
 {
-  return _wxrb_trace_level;
+  return wxrb_trace_level;
 }
 #endif
 %}

data/lib/wx/core/bitmap.rb

@@ -25,6 +25,13 @@ class Wx::Bitmap
     new(img, depth)
   end
 
+  # Create a new bitmap from an icon
+  def self.from_icon(icon)
+    bmp = self.new
+    bmp.copy_from_icon(icon)
+    bmp
+  end
+
   # Ruby methods that switch class are conventionally named to_foo
   alias :to_image :convert_to_image
 

data/lib/wx/core/choice.rb

@@ -1,3 +1,6 @@
+
+require_relative './controlwithitems'
+
 class Wx::Choice
   alias :get_item_data :get_client_data
   alias :set_item_data :set_client_data

data/lib/wx/core/combobox.rb

@@ -1,3 +1,6 @@
+
+require_relative './controlwithitems'
+
 class Wx::ComboBox
   alias :get_item_data :get_client_data
   alias :set_item_data :set_client_data

data/lib/wx/core/controlwithitems.rb

@@ -1,10 +1,106 @@
 # Superclass of a variety of controls that display lists of items (eg
 # Choice, ListBox, CheckListBox)
 class Wx::ControlWithItems
-  # Make these ruby enumerables so find, find_all, map etc are available 
+
+  # Make these Ruby enumerables so find, find_all, map etc are available
   include Enumerable
+
   # Passes each valid item index into the passed block
   def each
-    0.upto(get_count - 1) { | i | yield i }
+    get_count.times { | i | yield i }
+  end
+
+  # We need to cache client data in Ruby variables as we cannot access items
+  # during the GC mark phase as for some platforms (WXMSW at least) that would
+  # involve calling methods that would break in that phase.
+
+  def client_data_store
+    @client_data ||= []
+  end
+  private :client_data_store
+
+  wx_set_client_data = instance_method :set_client_data
+  define_method :set_client_data do |item, data|
+    item = item.to_i
+    wx_set_client_data.bind(self).call(item, data)
+    client_data_store[item] = data
+  end
+
+  def get_client_data(item)
+    client_data_store[item.to_i]
+  end
+
+  wx_append = instance_method :append
+  define_method :append do |item, data=nil|
+    if data
+      if ::Array === item
+        if !(::Array === data)
+          ::Kernel.raise ::TypeError.new("Expected Array for argument 3")
+        elsif data.size != item.size
+          ::Kernel.raise ::ArgumentError.new("item and data array must be equal size")
+        end
+        offs = get_count
+        wx_append.bind(self).call(item)
+        item.size.times { |ix| set_client_data(offs+ix, data[ix]) }
+      else
+        wx_append.bind(self).call(item, data)
+        client_data_store[get_count-1] = data
+      end
+    else
+      wx_append.bind(self).call(item)
+      # no changes to data store
+    end
+  end
+
+  wx_insert = instance_method :insert
+  define_method :insert do |item, pos, data=nil|
+    if data
+      if ::Array === item
+        if !(::Array === data)
+          ::Kernel.raise ::TypeError.new("Expected Array for argument 3")
+        elsif data.size != item.size
+          ::Kernel.raise ::ArgumentError.new("item and data array must be equal size")
+        end
+        wx_insert.bind(self).call(item, pos)
+        client_data_store.insert(pos, *::Array.new(item.size))
+        item.size.times { |ix| set_client_data(pos+ix, data[ix]) }
+      else
+        wx_insert.bind(self).call(item, pos, data)
+        client_data_store.insert(pos, data)
+      end
+    else
+      wx_insert.bind(self).call(item, pos)
+      if ::Array === item
+        client_data_store.insert(pos, *::Array.new(item.size))
+      else
+        client_data_store.insert(pos, nil)
+      end
+    end
+  end
+
+  wx_set = instance_method :set
+  define_method :set do |items, data=nil|
+    if data
+      if !(::Array === data)
+        ::Kernel.raise ::TypeError.new("Expected Array for argument 2")
+      elsif data.size != items.size
+        ::Kernel.raise ::ArgumentError.new("items and data array must be equal size")
+      end
+    end
+    wx_set.bind(self).call(items)
+    client_data_store.clear
+    items.each_with_index { |item, ix| set_client_data(item, data[ix]) }
+  end
+
+  wx_clear = instance_method :clear
+  define_method :clear do
+    wx_clear.bind(self).call
+    client_data_store.clear
+  end
+
+  wx_delete = instance_method :delete
+  define_method :delete do |item|
+    wx_delete.bind(self).call(item.to_i)
+    client_data_store.slice!(item.to_i)
   end
 end

data/lib/wx/core/icon.rb

@@ -14,12 +14,18 @@ class Wx::Icon
 
   def to_bitmap
     # for WXMSW platform Icon is not derived from Bitmap
-    return self unless Wx::PLATFORM == 'WXMSW'
+    return self unless Wx::PLATFORM == 'WXMSW' || Wx::PLATFORM == 'WXOSX'
     bm = Wx::Bitmap.new
     bm.copy_from_icon(self)
     bm
   end
 
+  if Wx::PLATFORM == 'WXMSW' || Wx::PLATFORM == 'WXOSX'
+    def convert_to_image
+      to_bitmap.convert_to_image
+    end
+  end
+
   # Redefine the initialize method so it raises an exception if a
   # non-existent file is given to the constructor; otherwise, wx Widgets
   # just carries on with an empty icon, which may cause faults

data/lib/wx/core/imagelist.rb

@@ -1,3 +1,14 @@
+
 class Wx::ImageList
+
+  # provide seamless support for adding icons on all platforms
+  wx_add = instance_method :add
+  define_method :add do |*args|
+    if Wx::Icon === args.first
+      args[0] = args.first.to_bitmap
+    end
+    wx_add.bind(self).call(*args)
+  end
+
   alias :<< :add
 end

data/lib/wx/core/listbox.rb

@@ -1,3 +1,6 @@
+
+require_relative './controlwithitems'
+
 class Wx::ListBox
   alias :get_item_data :get_client_data
   alias :set_item_data :set_client_data

data/lib/wx/doc/progress_dialog.rb

@@ -0,0 +1,37 @@
+
+class Wx::ProgressDialog
+
+  # Updates the dialog, setting the progress bar to the new value and updating the message if new one is specified.
+  #
+  # Returns <code>false</code> if the "Cancel" button has been pressed, <code>true</code> if neither "Cancel" nor
+  # "Skip" has been pressed and <code>:skipped</code> if "Skip" has been pressed.
+  #
+  # If false is returned, the application can either immediately destroy the dialog or ask the user for the confirmation
+  # and if the abort is not confirmed the dialog may be resumed with #resume method.
+  #
+  # If value is the maximum value for the dialog, the behaviour of the function depends on whether Wx::PD_AUTO_HIDE was
+  # used when the dialog was created. If it was, the dialog is hidden and the function returns immediately. If it was
+  # not, the dialog becomes a modal dialog and waits for the user to dismiss it, meaning that this function does not
+  # return until this happens.
+  #
+  # Notice that if newmsg is longer than the currently shown message, the dialog will be automatically made wider to
+  # account for it. However if the new message is shorter than the previous one, the dialog doesn't shrink back to
+  # avoid constant resizes if the message is changed often. To do this and fit the dialog to its current contents you
+  # may call fit explicitly. An alternative would be to keep the number of lines of text constant in order to avoid
+  # jarring dialog size changes. You may also want to make the initial message, specified when creating the dialog,
+  # wide enough to avoid having to resize the dialog later, e.g. by appending a long string of unbreakable spaces
+  # (wxString(L'\u00a0', 100)) to it.
+  # @param [Integer] value The new value of the progress meter. It should be less than or equal to the maximum value given to the constructor.
+  # @param [String] newmsg The new messages for the progress dialog text, if it is empty (which is the default) the message is not changed.
+  # @return [Boolean,:skipped]
+  def update(value, newmsg = '') end
+
+  # Like #update but makes the gauge control run in indeterminate mode.
+  #
+  # In indeterminate mode the remaining and the estimated time labels (if present) are set to "Unknown" or to newmsg
+  # (if it's non-empty). Each call to this function moves the progress bar a bit to indicate that some progress was done.
+  # @param [String] newmsg
+  # @return [Boolean,:skipped]
+  def pulse(newmsg = '') end
+
+end

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '0.9.0-beta.8'
+  WXRUBY_VERSION    = '0.9.0-beta.10'
 end

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/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/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/samples/dialogs/dialogs.rb

@@ -36,6 +36,7 @@ DIALOGS_STYLED_BUSYINFO = 25
 DIALOGS_FIND = 26
 DIALOGS_REPLACE = 27
 DIALOGS_PREFS = 28
+DIALOGS_PREFS_TOOLBOOK = 29
 
 class MyTipProvider < TipProvider
   TIPS = [
@@ -147,16 +148,18 @@ end
 # PropertySheetDialog is specialised for doing preferences dialogs; it
 # contains a BookCtrl of some sort
 class MyPrefsDialog < Wx::PropertySheetDialog
-  def initialize(parent)
+  def initialize(parent, pref_type)
     # Using Book type other than Notebook needs two-step construction
     super()
-    self.sheet_style = Wx::PROPSHEET_BUTTONTOOLBOOK
-    self.sheet_outer_border = 1
-    self.sheet_inner_border = 2
-    img_list = Wx::ImageList.new(32, 32)
-    img_list << std_bitmap(Wx::ART_NORMAL_FILE)
-    img_list << std_bitmap(Wx::ART_CDROM)
-    img_list << std_bitmap(Wx::ART_REPORT_VIEW)
+    if pref_type == DIALOGS_PREFS_TOOLBOOK
+      self.sheet_style = Wx::PROPSHEET_BUTTONTOOLBOOK
+      self.sheet_outer_border = 1
+      self.sheet_inner_border = 2
+      img_list = Wx::ImageList.new(32, 32)
+      img_list << std_bitmap(Wx::ART_NORMAL_FILE)
+      img_list << std_bitmap(Wx::ART_CDROM)
+      img_list << std_bitmap(Wx::ART_REPORT_VIEW)
+    end
 
     create(parent, -1, "Preferences")
     create_buttons(Wx::ID_OK|Wx::ID_CANCEL)
@@ -247,40 +250,41 @@ class MyFrame < Frame
     @index = -1
     @index_2 = -1
 
-    @max = 10
+    @max = 100
 
     create_status_bar()
 
-    evt_menu(DIALOGS_CHOOSE_COLOUR) {|event| on_choose_colour(event) }
-    evt_menu(DIALOGS_CHOOSE_FONT) {|event| on_choose_font(event) }
-    evt_menu(DIALOGS_LOG_DIALOG) {|event| on_log_dialog(event) }
-    evt_menu(DIALOGS_MESSAGE_BOX) {|event| on_message_box(event) }
-    evt_menu(DIALOGS_TEXT_ENTRY) {|event| on_text_entry(event) }
-    evt_menu(DIALOGS_PASSWORD_ENTRY) {|event| on_password_entry(event) }
-    evt_menu(DIALOGS_NUM_ENTRY) {|event| on_numeric_entry(event) }
-    evt_menu(DIALOGS_SINGLE_CHOICE) {|event| on_single_choice(event) }
-    evt_menu(DIALOGS_MULTI_CHOICE) {|event| on_multi_choice(event) }
-    evt_menu(DIALOGS_FILE_OPEN) {|event| on_file_open(event) }
-    evt_menu(DIALOGS_FILE_OPEN2) {|event| on_file_open2(event) }
-    evt_menu(DIALOGS_FILES_OPEN) {|event| on_files_open(event) }
-    evt_menu(DIALOGS_FILE_SAVE) {|event| on_file_save(event) }
-    evt_menu(DIALOGS_DIR_CHOOSE) {|event| on_dir_choose(event) }
-    evt_menu(DIALOGS_MODAL) {|event| on_modal_dlg(event) }
-    evt_menu(DIALOGS_MODELESS) {|event| on_modeless_dlg(event) }
-    evt_menu(DIALOGS_TIP) {|event| on_show_tip(event) }
-    evt_menu(DIALOGS_CUSTOM_TIP) {|event| on_show_custom_tip(event) }
-    evt_menu(DIALOGS_PROGRESS) {|event| on_show_progress(event) }
-    evt_menu(DIALOGS_BUSYINFO) {|event| on_show_busy_info(event) }
-    evt_menu(DIALOGS_STYLED_BUSYINFO) {|event| on_show_styled_busy_info(event) }
-    evt_menu(DIALOGS_PREFS) {|event| on_show_prefs(event) }
-    evt_menu(DIALOGS_FIND) {|event| on_show_find_dialog(event) }
-    evt_menu(DIALOGS_REPLACE) {|event| on_show_replace_dialog(event) }
-    evt_find(-1) {|event| on_find_dialog(event) }
-    evt_find_next(-1) {|event| on_find_dialog(event) }
-    evt_find_replace(-1) {|event| on_find_dialog(event) }
-    evt_find_replace_all(-1) {|event| on_find_dialog(event) }
-    evt_find_close(-1) {|event| on_find_dialog(event) }
-    evt_menu(ID_EXIT) {|event| on_exit(event) }
+    evt_menu(DIALOGS_CHOOSE_COLOUR, :on_choose_colour)
+    evt_menu(DIALOGS_CHOOSE_FONT, :on_choose_font)
+    evt_menu(DIALOGS_LOG_DIALOG, :on_log_dialog)
+    evt_menu(DIALOGS_MESSAGE_BOX, :on_message_box)
+    evt_menu(DIALOGS_TEXT_ENTRY, :on_text_entry)
+    evt_menu(DIALOGS_PASSWORD_ENTRY, :on_password_entry)
+    evt_menu(DIALOGS_NUM_ENTRY, :on_numeric_entry)
+    evt_menu(DIALOGS_SINGLE_CHOICE, :on_single_choice)
+    evt_menu(DIALOGS_MULTI_CHOICE, :on_multi_choice)
+    evt_menu(DIALOGS_FILE_OPEN, :on_file_open)
+    evt_menu(DIALOGS_FILE_OPEN2, :on_file_open2)
+    evt_menu(DIALOGS_FILES_OPEN, :on_files_open)
+    evt_menu(DIALOGS_FILE_SAVE, :on_file_save)
+    evt_menu(DIALOGS_DIR_CHOOSE, :on_dir_choose)
+    evt_menu(DIALOGS_MODAL, :on_modal_dlg)
+    evt_menu(DIALOGS_MODELESS, :on_modeless_dlg)
+    evt_menu(DIALOGS_TIP, :on_show_tip)
+    evt_menu(DIALOGS_CUSTOM_TIP, :on_show_custom_tip)
+    evt_menu(DIALOGS_PROGRESS, :on_show_progress)
+    evt_menu(DIALOGS_BUSYINFO, :on_show_busy_info)
+    evt_menu(DIALOGS_STYLED_BUSYINFO, :on_show_styled_busy_info)
+    evt_menu(DIALOGS_PREFS, :on_show_prefs)
+    evt_menu(DIALOGS_PREFS_TOOLBOOK,:on_show_prefs)
+    evt_menu(DIALOGS_FIND, :on_show_find_dialog)
+    evt_menu(DIALOGS_REPLACE, :on_show_replace_dialog)
+    evt_find(-1, :on_find_dialog)
+    evt_find_next(-1, :on_find_dialog)
+    evt_find_replace(-1, :on_find_dialog)
+    evt_find_replace_all(-1, :on_find_dialog)
+    evt_find_close(-1, :on_find_dialog)
+    evt_menu(ID_EXIT, :on_exit)
 
   end
 
@@ -614,26 +618,37 @@ class MyFrame < Frame
 
 
   def on_show_prefs(event)
-    MyPrefsDialog(self)
+    MyPrefsDialog(self, event.id)
   end
 
   def on_show_progress(event)
     cont = false
     Wx::ProgressDialog("Progress dialog example",
-                       "An informative message",
+                       "An informative message\n"+"#{' '*100}\n\n\n\n",
                        @max, # range
                        self, # parent
-                       PD_CAN_ABORT | PD_APP_MODAL |
+                       PD_CAN_ABORT | PD_CAN_SKIP | PD_APP_MODAL |
                          PD_ELAPSED_TIME | PD_ESTIMATED_TIME |
                          PD_REMAINING_TIME) do |dialog|
       cont = true
-      (@max+1).times do |i|
-        if i == @max
-          cont = dialog.update(i, "That's all, folks!")
-        elsif i == @max / 2
-          cont = dialog.update(i, "Only half of it left (very long message)!")
-        else
+      i = 0
+      while i <= @max
+        if i == 0
           cont = dialog.update(i)
+        elsif i == @max
+          cont = dialog.update(i, "That's all, folks!\n\nNothing more to see here any more.")
+        elsif i <= (@max / 2)
+          cont = dialog.pulse("Testing indeterminate mode\n" +
+                              "\n" +
+                              "This mode allows you to show to the user\n" +
+                              "that something is going on even if you don't know\n" +
+                              "when exactly will you finish.")
+        else
+          cont = dialog.update(i, "Now in standard determinate mode\n" +
+                                  "\n" +
+                                  "This is the standard usage mode in which you\n" +
+                                  "update the dialog after performing each new step of work.\n" +
+                                  "It requires knowing the total number of steps in advance.")
         end
 
         if !cont
@@ -644,8 +659,12 @@ class MyFrame < Frame
             break
           end
           dialog.resume
+        elsif cont == :skipped
+          i += (@max / 4)
+          i = @max-1 if i >= @max
         end
-        sleep(1)
+        sleep(i == 0 ? 1 : 0.15)
+        i += 1
       end
     end
 
@@ -831,7 +850,8 @@ class MyApp < App
     file_menu.append(DIALOGS_PROGRESS, "Pro&gress dialog\tCtrl-G")
     file_menu.append(DIALOGS_BUSYINFO, "&Busy info dialog\tCtrl-B")
     file_menu.append(DIALOGS_STYLED_BUSYINFO, "Styled BusyInfo dialog")
-    file_menu.append(DIALOGS_PREFS, "Propert&y sheet dialog\tCtrl-Y")
+    file_menu.append(DIALOGS_PREFS, "Standard propert&y sheet dialog\tCtrl-Y")
+    file_menu.append(DIALOGS_PREFS_TOOLBOOK, "&Toolbook property sheet dialog\tShift-Ctrl-Y")
     file_menu.append(DIALOGS_FIND, "&Find dialog\tCtrl-F", "", ITEM_CHECK)
     file_menu.append(DIALOGS_REPLACE, "Find and &replace dialog\tShift-Ctrl-F", "", ITEM_CHECK)
 

data/samples/drawing/maths_images.rb

@@ -211,7 +211,7 @@ class MathsPanel < Panel
   # Display a dialog to save the image to a file
   def on_save
     SaveImageDialog(parent) do |dlg|
-      if dlg.show_modal == ID_OK
+      if dlg.show_modal == Wx::ID_OK
         if dlg.image_type == Wx::BITMAP_TYPE_PNG
           # test writing to IO
           File.open(dlg.path, 'w') do |f|

data/samples/sampler/editor.rb

@@ -175,6 +175,19 @@ module WxRuby
       @editors.each { |e| e.find_close }
     end
 
+    def goto
+      res = Wx.get_number_from_user('Enter line number to go to.',
+                                    'Line:',
+                                    'Goto Line',
+                                    @editors[@edt_book.selection].current_line+1,
+                                    1,
+                                    @editors[@edt_book.selection].line_count,
+                                    @frame)
+      if res >= 1
+        @editors[@edt_book.selection].goto_line(res-1)
+      end
+    end
+
     def page_from_id(id)
       if id >= ID::EDT_MIN_ID && id < (ID::EDT_MIN_ID+@edt_book.page_count)
         id - ID::EDT_MIN_ID
@@ -231,6 +244,7 @@ module WxRuby
       FIND_NEXT = Wx::ID_FORWARD
       FIND_PREV = Wx::ID_BACKWARD
       REPLACE = Wx::ID_REPLACE
+      GOTO = Wx::ID_JUMP_TO
       %i[
         RUN
         TOGGLE_THEME
@@ -268,6 +282,8 @@ module WxRuby
       menuEdit.append(ID::FIND_NEXT, "Find Next\tF3", 'Find next occurrence of the search phrase')
       menuEdit.append(ID::FIND_PREV, "Find Previous\tShift-F3", 'Find previous occurrence of the search phrase')
       menuEdit.append(ID::REPLACE, "Replace...\tCtrl-R", 'Show Replace Dialog')
+      menuEdit.append_separator
+      menuEdit.append(ID::GOTO, "Got to line...\tCtrl-G", 'Move to line number')
 
       menuView = Wx::Menu.new
       menuView.append(ID::TOGGLE_THEME, 'Display dark theme', 'Display dark theme', Wx::ITEM_CHECK)
@@ -354,6 +370,8 @@ module WxRuby
       evt_menu(ID::FIND_NEXT, :on_find_next)
       evt_menu(ID::FIND_PREV, :on_find_prev)
 
+      evt_menu(ID::GOTO, :on_goto)
+
       layout
     end
 
@@ -555,6 +573,10 @@ module WxRuby
       set_status_text('')
     end
 
+    def on_goto(_evt)
+      @editors.goto
+    end
+
   end
 
 end

data/samples/sampler/ext.rb

@@ -38,12 +38,12 @@ end
 # otherwise samples using 'include Wx' (or other modules) will fail on referencing
 # a (module) method unscoped from one of these included modules
 module ::Kernel
-  def method_missing(name, *args)
+  def method_missing(name, *args, &block)
     if self.class.name.start_with?('WxRuby::Sample::SampleLoader_') && (scope = self.class.name.split('::')).size > 3
       top_mod = Object.const_get(scope[0,3].join('::'))
-      return top_mod.__send__(name, *args) if top_mod.respond_to?(name)
+      return top_mod.__send__(name, *args, &block) if top_mod.respond_to?(name)
       top_mod.included_modules.each do |imod|
-        return imod.__send__(name, *args) if imod.respond_to?(name)
+        return imod.__send__(name, *args, &block) if imod.respond_to?(name)
       end
     end
     super

data/samples/sampler/stc_editor.rb

@@ -117,35 +117,36 @@ module WxRuby
       style_set_foreground(Wx::STC::STC_STYLE_DEFAULT, Wx::BLACK);
       style_set_background(Wx::STC::STC_STYLE_DEFAULT, Wx::WHITE);
       style_clear_all
-      style_set_foreground(Wx::STC::STC_STYLE_LINENUMBER, Wx::Colour.new('SlateGray'))
+      style_set_foreground(Wx::STC::STC_STYLE_LINENUMBER, Wx::Colour.new('Dark Grey'))
       style_set_background(Wx::STC::STC_STYLE_LINENUMBER, Wx::WHITE);
       style_set_foreground(Wx::STC::STC_STYLE_INDENTGUIDE, Wx::LIGHT_GREY);
-      set_whitespace_background(false, Wx::Colour.new('DarkSlateGray'))
-      style_set_foreground(SCE_RB_COMMENTLINE, Wx::Colour.new('DARKGREEN'))
+      set_whitespace_background(false, Wx::Colour.new('Dark Slate Grey'))
+      style_set_foreground(SCE_RB_COMMENTLINE, Wx::Colour.new('Dark Green'))
       style_set_bold(SCE_RB_COMMENTLINE, true)
       style_set_foreground(SCE_RB_WORD, Wx::BLACK)
       style_set_bold(SCE_RB_WORD, true)
-      style_set_foreground(SCE_RB_OPERATOR, Wx::Colour.new('Teal'))
+      style_set_foreground(SCE_RB_OPERATOR, Wx::Colour.new('Dark Olive Green'))
       style_set_bold(SCE_RB_OPERATOR, true)
-      style_set_foreground(SCE_RB_POD, Wx::Colour.new('GREY'))
+      style_set_foreground(SCE_RB_POD, Wx::Colour.new('Grey'))
       style_set_foreground(SCE_RB_NUMBER, Wx::BLUE)
       style_set_foreground(SCE_RB_STRING, c_maroon)
       style_set_foreground(SCE_RB_CHARACTER, Wx::RED)
-      style_set_foreground(SCE_RB_SYMBOL, Wx::Colour.new('DARKBLUE'))
+      style_set_foreground(SCE_RB_SYMBOL, Wx::Colour.new('Navy'))
       style_set_bold(SCE_RB_SYMBOL, true)
-      # current wxWidgets Scintilla (Ruby lexer) version does not support these correctly
-      # style_set_foreground(SCE_RB_HERE_DELIM, Wx::BLACK)
-      # style_set_bold(SCE_RB_HERE_DELIM, true)
-      # style_set_foreground(SCE_RB_HERE_Q, c_maroon)
-      # style_set_foreground(SCE_RB_HERE_QQ, c_maroon)
-      # style_set_foreground(SCE_RB_HERE_QX, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_Q, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QQ, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QX, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QR, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QW, c_maroon)
-      bg = Wx::Colour.new('LightGray')
-      fg = Wx::Colour.new('DarkCyan')
+      if Wx::WXWIDGETS_VERSION >= '3.3.0'
+        style_set_foreground(SCE_RB_HERE_DELIM, Wx::BLACK)
+        style_set_bold(SCE_RB_HERE_DELIM, true)
+        style_set_foreground(SCE_RB_HERE_Q, c_maroon)
+        style_set_foreground(SCE_RB_HERE_QQ, c_maroon)
+        style_set_foreground(SCE_RB_HERE_QX, c_maroon)
+        style_set_foreground(SCE_RB_STRING_Q, c_maroon)
+        style_set_foreground(SCE_RB_STRING_QQ, c_maroon)
+        style_set_foreground(SCE_RB_STRING_QX, c_maroon)
+        style_set_foreground(SCE_RB_STRING_QR, c_maroon)
+        style_set_foreground(SCE_RB_STRING_QW, c_maroon)
+      end
+      bg = Wx::Colour.new('Light Grey')
+      fg = Wx::Colour.new('Cadet Blue')
       set_fold_margin_colour(true, bg)
       set_fold_margin_hi_colour(true, bg)
       marker_set_foreground(Wx::STC::STC_MARKNUM_FOLDER, fg)
@@ -155,7 +156,8 @@ module WxRuby
     end
 
     def dark_theme
-      bg = Wx::Colour.new('DarkSlateGray')
+      bg = Wx::Colour.new('Dark Slate Grey')
+      c_str = Wx::Colour.new('Lime Green')
       style_set_background(Wx::STC::STC_STYLE_DEFAULT, bg)
       style_set_foreground(Wx::STC::STC_STYLE_DEFAULT, Wx::WHITE)
       style_clear_all
@@ -164,39 +166,40 @@ module WxRuby
       style_set_foreground(Wx::STC::STC_STYLE_INDENTGUIDE, bg);
       set_whitespace_background(true, bg)
       style_set_eol_filled(SCE_RB_DEFAULT, true)
-      style_set_foreground(SCE_RB_COMMENTLINE, Wx::Colour.new('Silver'))
+      style_set_foreground(SCE_RB_COMMENTLINE, Wx::Colour.new('Light Grey'))
       style_set_background(SCE_RB_COMMENTLINE, bg)
       style_set_bold(SCE_RB_COMMENTLINE, true)
-      style_set_foreground(SCE_RB_WORD, Wx::Colour.new('Chocolate'))
+      style_set_foreground(SCE_RB_WORD, Wx::Colour.new('Coral'))
       style_set_background(SCE_RB_WORD, bg)
       style_set_bold(SCE_RB_WORD, true)
-      style_set_foreground(SCE_RB_OPERATOR, Wx::Colour.new('LightCyan'))
+      style_set_foreground(SCE_RB_OPERATOR, Wx::Colour.new('Light Grey'))
       style_set_background(SCE_RB_OPERATOR, bg)
       style_set_bold(SCE_RB_OPERATOR, true)
-      style_set_foreground(SCE_RB_POD, Wx::Colour.new('Gray'))
+      style_set_foreground(SCE_RB_POD, Wx::Colour.new('Grey'))
       style_set_background(SCE_RB_POD, bg)
-      style_set_foreground(SCE_RB_NUMBER, Wx::Colour.new('DeepSkyBlue'))
+      style_set_foreground(SCE_RB_NUMBER, Wx::Colour.new('Cyan'))
       style_set_background(SCE_RB_NUMBER, bg)
-      style_set_foreground(SCE_RB_STRING, Wx::Colour.new('LimeGreen'))
+      style_set_foreground(SCE_RB_STRING, c_str)
       style_set_background(SCE_RB_STRING, bg)
-      style_set_foreground(SCE_RB_CHARACTER, Wx::Colour.new('YellowGreen'))
+      style_set_foreground(SCE_RB_CHARACTER, Wx::Colour.new('Yellow Green'))
       style_set_background(SCE_RB_CHARACTER, bg)
       style_set_foreground(SCE_RB_SYMBOL, Wx::Colour.new('Gold'))
       style_set_background(SCE_RB_SYMBOL, bg)
       style_set_bold(SCE_RB_SYMBOL, true)
-      # current wxWidgets Scintilla (Ruby lexer) version does not support these correctly
-      # style_set_foreground(SCE_RB_HERE_DELIM, Wx::BLACK)
-      # style_set_bold(SCE_RB_HERE_DELIM, true)
-      # style_set_foreground(SCE_RB_HERE_Q, c_maroon)
-      # style_set_foreground(SCE_RB_HERE_QQ, c_maroon)
-      # style_set_foreground(SCE_RB_HERE_QX, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_Q, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QQ, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QX, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QR, c_maroon)
-      # style_set_foreground(SCE_RB_STRING_QW, c_maroon)
-      bg = Wx::Colour.new('CadetBlue')
-      fg = Wx::Colour.new('Chocolate')
+      if Wx::WXWIDGETS_VERSION >= '3.3.0'
+        style_set_foreground(SCE_RB_HERE_DELIM, Wx::Colour.new('Coral'))
+        style_set_bold(SCE_RB_HERE_DELIM, true)
+        style_set_foreground(SCE_RB_HERE_Q, c_str)
+        style_set_foreground(SCE_RB_HERE_QQ, c_str)
+        style_set_foreground(SCE_RB_HERE_QX, c_str)
+        style_set_foreground(SCE_RB_STRING_Q, c_str)
+        style_set_foreground(SCE_RB_STRING_QQ, c_str)
+        style_set_foreground(SCE_RB_STRING_QX, c_str)
+        style_set_foreground(SCE_RB_STRING_QR, c_str)
+        style_set_foreground(SCE_RB_STRING_QW, c_str)
+      end
+      bg = Wx::Colour.new('Cadet Blue')
+      fg = Wx::Colour.new('Coral')
       set_fold_margin_colour(true, bg)
       set_fold_margin_hi_colour(true, bg)
       marker_set_foreground(Wx::STC::STC_MARKNUM_FOLDER, fg)
@@ -212,7 +215,7 @@ module WxRuby
         start_pos = current_pos
         end_pos = length-1
       else
-        start_pos = current_pos
+        start_pos = [0, current_pos - (@search_indicator ? @search_indicator.last : 0)].max
         end_pos = 0
       end
       pos, end_pos = find_text(start_pos, end_pos, txt, flags)

data/samples/sampler/txt_editor.rb

@@ -35,9 +35,9 @@ module WxRuby
     end
 
     def dark_theme
-      self.background_colour = Wx::Colour.new('DarkSlateGray')
+      self.background_colour = Wx::Colour.new('Dark Slate Grey')
       self.foreground_colour = Wx::WHITE
-      self.set_default_style(txtatt = Wx::TextAttr.new(Wx::WHITE, Wx::Colour.new('DarkSlateGray'), self.font))
+      self.set_default_style(txtatt = Wx::TextAttr.new(Wx::WHITE, Wx::Colour.new('Dark Slate Grey'), self.font))
       self.set_style(0, self.get_last_position, txtatt)
     end
 
@@ -45,6 +45,24 @@ module WxRuby
       clear
     end
 
+    def get_line_count
+      number_of_lines
+    end
+    alias :line_count :get_line_count
+
+    def get_current_line
+      pos = insertion_point
+      _, line = position_to_xy(pos)
+      line
+    end
+    alias :current_line :get_current_line
+
+    def goto_line(line)
+      pos = xy_to_position(0, line)
+      self.show_position(pos)
+      self.insertion_point = pos
+    end
+
     def do_find(txt, forward, whole_word, match_case)
       options = (match_case ? 0 : Regexp::IGNORECASE)
       pattern = if whole_word
@@ -52,7 +70,12 @@ module WxRuby
                 else
                   ::Regexp.new(txt, options)
                 end
-      forward ? self.value.index(pattern, self.insertion_point) : self.value.rindex(pattern, self.insertion_point)
+      if forward
+        self.value.index(pattern, insertion_point)
+      else
+        start_pos = [0, insertion_point - (@search_indicator ? @search_indicator.last+1 : 0)].max
+        self.value.rindex(pattern, start_pos)
+      end
     end
 
     def indicator_clear_range(pos, len)

data/samples/treectrl/treectrl.rb

@@ -262,39 +262,41 @@ class MyTreeCtrl < Wx::TreeCtrl
   end
 
   def create_buttons_image_list(size)
-    if size < 0
-      self.buttons_image_list = nil
-      return
-    end
-
-    # Make an image list containing small icons
-    images = Wx::ImageList.new(size, size, true)
+    unless Wx::PLATFORM == 'WXMSW'
+      if size < 0
+        self.buttons_image_list = nil
+        return
+      end
 
-    # should correspond to TreeCtrlIcon_xxx enum
-    Wx::BusyCursor.busy do
-      icons = if @alternate_images
-                [Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon3.xpm'), Wx::BITMAP_TYPE_XPM),
-                 Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon3.xpm'), Wx::BITMAP_TYPE_XPM),
-                 Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon5.xpm'), Wx::BITMAP_TYPE_XPM),
-                 Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon5.xpm'), Wx::BITMAP_TYPE_XPM)
-                ]
-              else
-                icon_size = Wx::Size.new(@image_size, @image_size)
-                ic1 = Wx::ArtProvider::get_icon(Wx::ART_FOLDER, Wx::ART_LIST, icon_size)
-                ic2 = Wx::ArtProvider::get_icon(Wx::ART_FOLDER_OPEN, Wx::ART_LIST, icon_size)
-                [ic1, ic1, ic2, ic2]
-              end
+      # Make an image list containing small icons
+      images = Wx::ImageList.new(size, size, true)
 
-      icons.each do |ic|
-        if ic.width == size
-          images.add(ic)
-        else
-          resized = ic.convert_to_image.rescale(size, size)
-          images.add(Wx::Bitmap.new(resized))
+      # should correspond to TreeCtrlIcon_xxx enum
+      Wx::BusyCursor.busy do
+        icons = if @alternate_images
+                  [Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon3.xpm'), Wx::BITMAP_TYPE_XPM),
+                   Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon3.xpm'), Wx::BITMAP_TYPE_XPM),
+                   Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon5.xpm'), Wx::BITMAP_TYPE_XPM),
+                   Wx::Icon.new(File.join(File.dirname(__FILE__), 'icon5.xpm'), Wx::BITMAP_TYPE_XPM)
+                  ]
+                else
+                  icon_size = Wx::Size.new(@image_size, @image_size)
+                  ic1 = Wx::ArtProvider::get_icon(Wx::ART_FOLDER, Wx::ART_LIST, icon_size)
+                  ic2 = Wx::ArtProvider::get_icon(Wx::ART_FOLDER_OPEN, Wx::ART_LIST, icon_size)
+                  [ic1, ic1, ic2, ic2]
+                end
+
+        icons.each do |ic|
+          if ic.width == size
+            images.add(ic)
+          else
+            resized = ic.convert_to_image.rescale(size, size)
+            images.add(Wx::Bitmap.new(resized))
+          end
         end
-      end
 
-      self.buttons_image_list = images
+        self.buttons_image_list = images
+      end
     end
   end
 
@@ -1454,7 +1456,7 @@ class MyFrame < Wx::Frame
   end
 
   def on_toggle_buttons(event)
-    unless Wx.has_feature?(:WXMSW)
+    unless Wx::PLATFORM == 'WXMSW'
       if Wx::THE_APP.show_buttons
         @treectrl.create_buttons_image_list(-1)
         Wx::get_app.show_buttons = false

data/tests/test_item_data.rb

@@ -31,6 +31,73 @@ class TestItemData < Test::Unit::TestCase
     assert_retrievable_data(f.control, 0, { 'b' => 'B' })
     assert_retrievable_data(f.control, 1, 'string item data')
     assert_retrievable_data(f.control, 2, 42.3)
+
+    GC.start
+
+    # single item append; no data
+    f.control.append('integer')
+    assert_equal(4, f.control.count)
+    assert_equal('integer', f.control.get_string(3))
+    assert_equal(nil, f.control.get_item_data(3))
+
+    # single item append; with data
+    f.control.append('array', 110)
+    assert_equal(5, f.control.count)
+    assert_equal('array', f.control.get_string(4))
+    assert_equal(110, f.control.get_item_data(4))
+
+    # array item append; no data
+    f.control.append(%w[set tree bag])
+    assert_equal(8, f.control.count)
+    assert_equal(nil, f.control.get_item_data(5))
+    assert_equal(nil, f.control.get_item_data(7))
+
+    # array item append; with data
+    f.control.append(%w[object module class], ['O', 'M', 'C'])
+    assert_equal(11, f.control.count)
+    assert_equal('O', f.control.get_item_data(8))
+    assert_equal('C', f.control.get_item_data(10))
+
+    GC.start
+
+    # single item insert; no data
+    f.control.insert('integer2', 3)
+    assert_equal(12, f.control.count)
+    assert_equal('integer2', f.control.get_string(3))
+    assert_equal(nil, f.control.get_item_data(3))
+
+    # single item insert; with data
+    f.control.insert('array2', 4, 110)
+    assert_equal(13, f.control.count)
+    assert_equal('array2', f.control.get_string(4))
+    assert_equal(110, f.control.get_item_data(4))
+
+    # array item insert; no data
+    f.control.insert(%w[set2 tree2 bag2], 5)
+    assert_equal(16, f.control.count)
+    assert_equal(nil, f.control.get_item_data(5))
+    assert_equal(nil, f.control.get_item_data(7))
+
+    # array item insert; with data
+    f.control.insert(%w[object2 module2 class2], 8, ['O', 'M', 'C'])
+    assert_equal(19, f.control.count)
+    assert_equal('O', f.control.get_item_data(8))
+    assert_equal('C', f.control.get_item_data(10))
+
+    GC.start
+
+    # item delete
+    f.control.delete(8)
+    assert_equal(18, f.control.count)
+    assert_equal('M', f.control.get_item_data(8))
+
+    GC.start
+
+    # clear all
+    f.control.clear
+    assert_equal(0, f.control.count)
+
+    GC.start
   end
 
   def test_treectrl_itemdata

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wxruby3
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre.beta.8
+  version: 0.9.0.pre.beta.10
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-27 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -190,6 +190,7 @@ files:
 - lib/wx/doc/pg/pgeditor.rb
 - lib/wx/doc/pg/property_grid.rb
 - lib/wx/doc/pg/property_grid_interface.rb
+- lib/wx/doc/progress_dialog.rb
 - lib/wx/doc/prt/page_setup_dialog.rb
 - lib/wx/doc/prt/print_data.rb
 - lib/wx/doc/prt/print_dialog.rb