wxruby3 0.9.1-x64-mingw-ucrt → 0.9.3-x64-mingw-ucrt

data/lib/wx/html/simple_html_listbox.rb

@@ -4,105 +4,38 @@
 
 class Wx::HTML::SimpleHtmlListBox
 
-  # Make this a Ruby enumerable so find, find_all, map etc are available
-  include Enumerable
-
-  # Passes each valid item index into the passed block
-  def each
-    get_count.times { | i | yield i }
-  end
-
-  # We need to cache client data in Ruby variables as we cannot access items
-  # during the GC mark phase as for some platforms (WXMSW at least) that would
-  # involve calling methods that would break in that phase.
-
-  def client_data_store
-    @client_data ||= []
-  end
-  private :client_data_store
-
-  wx_set_client_data = instance_method :set_client_data
-  define_method :set_client_data do |item, data|
-    item = item.to_i
-    wx_set_client_data.bind(self).call(item, data)
-    client_data_store[item] = data
-  end
-
-  def get_client_data(item)
-    client_data_store[item.to_i]
-  end
-
-  wx_append = instance_method :append
-  define_method :append do |item, data=nil|
-    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
+  # make sure to honor the inherited common overloads
+  wx_get_client_object = instance_method :get_client_object
+  define_method :get_client_object do |*args|
+    if args.empty?
+      super()
     else
-      wx_append.bind(self).call(item)
-      # no changes to data store
+      wx_get_client_object.bind(self).call(*args)
     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
+  wx_set_client_object = instance_method :set_client_object
+  define_method :set_client_object do |*args|
+    if args.size < 2
+      super(*args)
     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
+      wx_set_client_object.bind(self).call(*args)
     end
   end
+  # redefine aliases
+  alias :client_object :get_client_object
+  alias :client_object= :set_client_object
 
-  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
+  alias :get_client_data :get_client_object
+  alias :set_client_data :set_client_object
 
-  wx_clear = instance_method :clear
-  define_method :clear do
-    wx_clear.bind(self).call
-    client_data_store.clear
+  # Overload to provide Enumerator without block
+  wx_each_string = instance_method :each_string
+  define_method :each_string do |&block|
+    if block
+      wx_each_string.bind(self).call(&block)
+    else
+      ::Enumerator.new { |y| wx_each_string.bind(self).call { |ln| y << ln } }
+    end
   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/keyword_defs.rb

@@ -290,7 +290,12 @@ end
 # A button which stays pressed when clicked by user.
 Wx::define_keyword_ctors(Wx::ToggleButton) do
   wx_ctor_params :id, :label, :pos, :size, :style
-  wx_ctor_params :validator, :name => 'checkBox'
+  wx_ctor_params :validator, :name => 'toggleButton'
+end
+
+Wx::define_keyword_ctors(Wx::BitmapToggleButton) do
+  wx_ctor_params :id, :label, :pos, :size, :style
+  wx_ctor_params :validator, :name => 'bitmapToggleButton'
 end
 
 # Control showing an entire calendar month
@@ -320,6 +325,12 @@ Wx::define_keyword_ctors(Wx::CheckListBox) do
   wx_ctor_params :validator, :name => 'listBox'
 end
 
+# wxEditableListBox - an editable listbox is composite control that lets the user easily enter, delete and reorder a list of strings.
+Wx::define_keyword_ctors(Wx::EditableListBox) do
+  wx_ctor_params :id, :label, :pos, :size, :style => Wx::EL_DEFAULT_STYLE
+  wx_ctor_params :name => 'editableListBox'
+end
+
 # wxChoice 	Choice control (a combobox without the editable area)
 Wx::define_keyword_ctors(Wx::Choice) do
   wx_ctor_params :id, :pos, :size, :choices, :style
@@ -349,6 +360,14 @@ Wx::define_keyword_ctors(Wx::ComboCtrl) do
   wx_ctor_params :validator, :name => 'comboCtrl'
 end
 
+# wxOwnerDrawnComboBox
+Wx::define_keyword_ctors(Wx::OwnerDrawnComboBox) do
+  wx_ctor_params :id, :value => ''
+  wx_ctor_params :pos, :size, :choices => []
+  wx_ctor_params :style
+  wx_ctor_params :validator, :name => 'ownerDrawnComboBox'
+end
+
 # wxGauge 	A control to represent a varying quantity, such as time
 # remaining
 Wx::define_keyword_ctors(Wx::Gauge) do
@@ -421,9 +440,16 @@ Wx::define_keyword_ctors(Wx::StaticBitmap) do
   wx_ctor_params :id
   # autoconvert Bitmaps to BitmapBundles for downward compatibility
   wx_ctor_params :label
-  wx_ctor_params :pos, :size, :style, :name => Wx::StaticBitmapNameStr
+  wx_ctor_params :pos, :size, :style, :name => Wx::STATIC_BITMAP_NAME_STR
 end
 
+# wxGenericStaticBitmap 	A control to display a bitmap
+Wx::define_keyword_ctors(Wx::GenericStaticBitmap) do
+  wx_ctor_params :id
+  # autoconvert Bitmaps to BitmapBundles for downward compatibility
+  wx_ctor_params :label
+  wx_ctor_params :pos, :size, :style, :name => Wx::STATIC_BITMAP_NAME_STR
+end
 
 # wxRadioBox 	A group of radio buttons
 Wx::define_keyword_ctors(Wx::RadioBox) do
@@ -582,3 +608,9 @@ Wx::define_keyword_ctors(Wx::RearrangeCtrl) do
   wx_ctor_params :id, :pos, :size, :order, :items, :style
   wx_ctor_params :validator, :name => 'rearrangeCtrl'
 end
+
+Wx::define_keyword_ctors(Wx::HeaderCtrlSimple) do
+  wx_ctor_params :winid => Wx::ID_ANY
+  wx_ctor_params :pos, :size, :style => Wx::HD_DEFAULT_STYLE
+  wx_ctor_params :name => 'headerCtrlSimple'
+end

data/lib/wx/pg/pg_property.rb

@@ -37,4 +37,26 @@ module Wx::PG
     alias :attributes= :set_attributes
   end
 
+  class PGChoices
+
+    wx_each_label = instance_method :each_label
+    define_method :each_label do
+      if block_given?
+        wx_each_label.bind(self).call
+      else
+        ::Enumerator.new { |y| wx_each_label.bind(self).call { |lbl| y << lbl } }
+      end
+    end
+
+    wx_each_entry = instance_method :each_entry
+    define_method :each_entry do
+      if block_given?
+        wx_each_entry.bind(self).call
+      else
+        ::Enumerator.new { |y| wx_each_entry.bind(self).call { |entry| y << entry } }
+      end
+    end
+    
+  end
+  
 end

data/lib/wx/rbn/ribbon_gallery.rb

@@ -4,27 +4,6 @@
 
 class Wx::RBN::RibbonGallery
 
-  def item_client_data_store
-    @item_client_data ||= {}
-  end
-  private :item_client_data_store
-
-  def set_item_client_data(item, data)
-    item_client_data_store[item] = data
-  end
-
-  def get_item_client_data(item)
-    item_client_data_store[item]
-  end
-  alias :item_client_data :get_item_client_data
-
-  wx_append = instance_method :append
-  define_method :append do |bmp, item_id, data=nil|
-    item = wx_append.bind(self).call(bmp, item_id)
-    set_item_client_data(item, data) if item && data
-    item
-  end
-
   def items
     if block_given?
       count.times { |i| yield item(i) }

data/lib/wx/rtc/require.rb

@@ -7,7 +7,10 @@
 require_relative './ext'
 require_relative './events/evt_list'
 require_relative './keyword_defs'
+require_relative './rich_text_ctrl'
 require_relative './richtext_buffer'
+require_relative './rich_text_composite_object'
+require_relative './rich_text_paragraph'
 require_relative './richtext_formatting_dialog'
 require_relative './symbol_picker_dialog'
 require_relative './richtext_style_organiser_dialog'

data/lib/wx/rtc/rich_text_composite_object.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+module Wx
+
+  module RTC
+
+    class RichTextCompositeObject
+
+      # Overload to provide Enumerator without block
+      wx_each_child = instance_method :each_child
+      define_method :each_child do |&block|
+        if block
+          wx_each_child.bind(self).call(&block)
+        else
+          ::Enumerator.new { |y| wx_each_child.bind(self).call { |rto| y << rto } }
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/wx/rtc/rich_text_ctrl.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+module Wx
+
+  module RTC
+
+    class RichTextCtrl
+
+      # Overload to provide Enumerator without block
+      wx_each_line = instance_method :each_line
+      define_method :each_line do |&block|
+        if block
+          wx_each_line.bind(self).call(&block)
+        else
+          ::Enumerator.new { |y| wx_each_line.bind(self).call { |ln| y << ln } }
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/wx/rtc/rich_text_paragraph.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+module Wx
+
+  module RTC
+
+    class RichTextParagraph
+
+      # Overload to provide Enumerator without block
+      wx_each_line = instance_method :each_line
+      define_method :each_line do |&block|
+        if block
+          wx_each_line.bind(self).call(&block)
+        else
+          ::Enumerator.new { |y| wx_each_line.bind(self).call { |ln| y << ln } }
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/wx/stc/require.rb

@@ -6,5 +6,6 @@
 
 require_relative './events/evt_list'
 require_relative './keyword_defs'
+require_relative './styled_text_ctrl'
 
 Wx::Dialog.setup_dialog_functors(Wx::STC)

data/lib/wx/stc/styled_text_ctrl.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+module Wx
+
+  module STC
+
+    class StyledTextCtrl
+
+      # Overload to provide Enumerator without block
+      wx_each_line = instance_method :each_line
+      define_method :each_line do |&block|
+        if block
+          wx_each_line.bind(self).call(&block)
+        else
+          ::Enumerator.new { |y| wx_each_line.bind(self).call { |ln| y << ln } }
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/wx/version.rb

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

data/rakelib/lib/config/linux.rb

@@ -65,9 +65,6 @@ module WXRuby3
           # create a .so binary
           @extra_ldflags << '-shared'
 
-          # This class is not available on linux ports (wxGTK/wxQT/wxX11/wxMotif)
-          exclude_module('wxPrinterDC')
-
           unless @wx_path.empty?
             libdirs = @wx_libs.select {|s| s.start_with?('-L')}.collect {|s| s.sub(/^-L/,'')}
             @exec_env['LD_LIBRARY_PATH'] = "#{ENV['LD_LIBRARY_PATH']}:#{dest_dir}:#{libdirs.join(':')}"

data/rakelib/lib/config/macosx.rb

@@ -65,7 +65,7 @@ module WXRuby3
               end
             end
             # some weird thing with this; at least sometimes '--libs all' will not output media library even if feature active
-            if features_set?('wxUSE_MEDIACTRL')
+            if features_set?('USE_MEDIACTRL')
               lib_list = wx_config("--libs media").split(' ')
               until lib_list.empty?
                 s = lib_list.shift
@@ -107,7 +107,7 @@ module WXRuby3
           @ld.sub!(/-o\s*\Z/, '')
 
           @extra_cflags.concat %w[-Wno-unused-function -Wno-conversion-null -Wno-sometimes-uninitialized
-                                  -Wno-overloaded-virtual -Wno-deprecated-copy -Wno-format-security]
+                                  -Wno-overloaded-virtual -Wno-deprecated-copy]
           @extra_cflags << ' -Wno-deprecated-declarations' unless @no_deprecated
 
           # create a .dylib binary

data/rakelib/lib/config/mingw.rb

@@ -35,7 +35,7 @@ module WXRuby3
           end
 
           def debug_command(*args)
-            args.unshift(FileUtils::RUBY)
+            args.unshift(nix_path(FileUtils::RUBY))
             args.unshift('--args')
             args.unshift('gdb')
             args.join(' ')
@@ -53,6 +53,18 @@ module WXRuby3
             "{#{dll_ext},dll}"
           end
 
+          def do_link(pkg)
+            # have to use option file for objects to link on windows because command line gets too long
+            ftmp = Tempfile.new('object')
+            ftmp.puts pkg.all_obj_files.collect { |o| File.join('..', o) }.join(' ')
+            ftmp.close # close but do not unlink
+            objs = "@#{ftmp.path}"
+            depsh = pkg.dep_libnames.collect { |dl| "#{dl}.#{dll_ext}" }.join(' ')
+            sh "cd lib && #{WXRuby3.config.ld} #{WXRuby3.config.ldflags(pkg.lib_target)} #{objs} #{depsh} " +
+                 "#{WXRuby3.config.libs} #{WXRuby3.config.link_output_flag}#{pkg.lib_target}"
+            ftmp.unlink # cleanup
+          end
+
           private
 
           def wx_make

data/rakelib/lib/config/unixish.rb

@@ -136,7 +136,7 @@ module WXRuby3
         wx_libset = ::Set.new
         wx_libset.merge wx_config("--libs all").split(' ')
         # some weird thing with this; at least sometimes '--libs all' will not output media library even if feature active
-        if features_set?('wxUSE_MEDIACTRL')
+        if features_set?('USE_MEDIACTRL')
           wx_libset.merge wx_config("--libs media").split(' ')
         end
         wx_libset.collect { |s| s.dup }

data/rakelib/lib/config.rb

@@ -589,7 +589,7 @@ module WXRuby3
           private :any_feature_set?
 
           def features_set?(*featureset)
-            featureset.all? do |feature|
+            featureset.flatten.all? do |feature|
               if AnyOf === feature
                 any_feature_set?(*feature.features)
               else
@@ -615,9 +615,19 @@ module WXRuby3
           def _retrieve_features(wxwidgets_setup_h)
             features = {}
 
-            File.read(wxwidgets_setup_h).scan(/^\s*#define\s+(wx\w+|__\w+__)\s+([01])/) do | define |
-              features[$1] = $2.to_i.zero? ? false : true
-            end if is_configured? && wxwidgets_setup_h
+            if is_configured? && wxwidgets_setup_h
+              File.read(wxwidgets_setup_h).scan(/^\s*#define\s+(wx\w+|__\w+__)\s+([01])/) do | define |
+                feat_val = $2.to_i.zero? ? false : true
+                feat_id = $1.sub(/\Awx/i, '').gsub(/\A__|__\Z/, '')
+                features[feat_id] = feat_val
+              end
+              # make sure correct platform defines are included as well which will not be the case always
+              # (for example __WXMSW__ and __WXOSX__ are not in setup.h)
+              features['WXMSW'] = true if features['GNUWIN32']
+              features['WXOSX'] = true if features['DARWIN']
+              # prior to wxWidgets 3.3 this feature was not set for wxGTK builds
+              features['WXGTK'] = true if features['LINUX'] && !features['WXGTK'] && wx_port == :wxgtk
+            end
 
             features
           end

data/rakelib/yard/templates/default/fulldoc/html/css/wxruby3.css

@@ -1,7 +1,79 @@
 
-blockquote {
+div.wxrb-note {
     background: #f7f7f9;
-    border-left: .25em solid #e1e1e8;
+    border-left: .6em solid #f3ba6f;
+    border-radius: 3px;
     margin: 14px;
     padding-left: 14px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+div.wxrb-remark {
+    background: #f7f7f9;
+    border-left: .6em solid #f6f4ab;
+    border-radius: 3px;
+    margin: 14px;
+    padding-left: 14px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+div.wxrb-note p,
+div.wxrb-remark p {
+    margin: 0;
+}
+
+div.wxrb-logo {
+    float: right;
+    padding-top: 12px;
+}
+
+div.wxrb-logo img {
+    vertical-align: middle;
+}
+
+div.wxrb-logo span.wxrb-name {
+    font-size: large;
+    font-weight: bold;
+    margin-left: 10px;
+}
+
+div.wxrb-logo span.wxrb-name a {
+    color: black;
+}
+
+div.wxrb-logo span.wxrb-version {
+    font-size: medium;
+    font-weight: normal;
+    margin-right: 15px;
+}
+
+div.wxrb-logo span.wxrb-wxver {
+    font-size: 0.9em;
+    font-weight: normal;
+    margin-right: 15px;
+}
+
+div.wxrb-logo table {
+    display: inline;
+}
+
+div.wxrb-logo table td {
+    margin: 0;
+}
+
+.discussion div.note {
+    background: #f7f7f9;
+    border-left: .6em solid #f3ba6f;
+    margin: 14px;
+}
+
+.tags span.wxrb-require {
+    border-radius: 5px;
+    border: 1px solid #E1E1E8;
+    padding: 0px 3px 0px 3px;
+    background: #f3ba6f;
+    font-weight: bold;
+    font-size: 0.9em;
 }

data/rakelib/yard/templates/default/fulldoc/html/full_list.erb

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta charset="<%= charset %>" />
+    <% stylesheets_full_list.each do |stylesheet| %>
+      <link rel="stylesheet" href="<%= mtime_url(stylesheet) %>" type="text/css" media="screen" />
+    <% end %>
+
+    <% javascripts_full_list.each do |javascript| %>
+      <script type="text/javascript" charset="utf-8" src="<%= mtime_url(javascript) %>"></script>
+    <% end %>
+
+    <title><%= @list_title %></title>
+    <base id="base_target" target="_parent" />
+  </head>
+  <body>
+    <div id="content">
+      <div class="fixed_header">
+        <%= logo_and_version %>
+        <h1 id="full_list_header"><%= @list_title %></h1>
+        <div id="full_list_nav">
+          <% menu_lists.each do |list| %>
+            <span><a target="_self" href="<%= url_for_list list[:type] %>">
+              <%= list[:title] %>
+            </a></span>
+          <% end %>
+        </div>
+
+        <div id="search">Search: <input type="text" /></div>
+      </div>
+
+      <ul id="full_list" class="<%= @list_class || @list_type %>">
+        <%= erb "full_list_#{@list_type}" %>
+      </ul>
+    </div>
+  </body>
+</html>

data/rakelib/yard/templates/default/fulldoc/html/setup.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+def init
+  # It seems YARD messes things up so that a number of classes are not properly
+  # registered in their enclosing namespaces.
+  # This hack makes sure that if that is the case we fix that here.
+  all_classes = Registry.all(:class)
+  all_classes.each do |c|
+    if (ns = c.namespace)
+      unless ns.children.any? { |nsc| nsc.path == c.path }
+        ns.children << c # class missing from child list of enclosing namespace -> add here
+      end
+    end
+    if (ns = Registry[c.namespace.path])
+      unless ns.children.any? { |nsc| nsc.path == c.path }
+        ns.children << c # class missing from child list of enclosing namespace -> add here
+      end
+    end
+  end
+  super
+end
+
+def stylesheets_full_list
+  super + %w(css/wxruby3.css)
+end
+
+def logo_and_version
+  wxver = Registry['Wx::WXRUBY_VERSION']
+  wxwver = Registry['Wx::WXWIDGETS_VERSION']
+  <<~__HTML
+  <div class='wxrb-logo'>
+    <img src='assets/logo.png' height='38'/>
+    <table><tbody>
+      <tr><td><span class='wxrb-name'><a href="https://github.com/mcorino/wxRuby3">wxRuby3</a></span></td><td><span class='wxrb-version'>Version: #{::Kernel.eval(wxver.value)}</span></td></tr>
+      <tr><td></td><td><span class="wxrb-wxver">(wxWidgets: #{::Kernel.eval(wxwver.value)})</span></td></tr>
+    </tbody></table>
+  </div>
+  __HTML
+end