wxruby3 0.9.1 → 0.9.3

data/rakelib/lib/typemap/common.rb

@@ -211,7 +211,8 @@ module WXRuby3
 
         map 'wxSize&' => 'Array(Integer, Integer), Wx::Size',
             'wxPoint&' => 'Array(Integer, Integer), Wx::Point' do
-          map_in code: <<~__CODE
+          add_header_code '#include <memory>'
+          map_in temp: 'std::unique_ptr<$1_basetype> tmp', code: <<~__CODE
             if ( TYPE($input) == T_DATA )
             {
               void* argp$argnum;
@@ -222,8 +223,7 @@ module WXRuby3
             {
               $1 = new $1_basetype( NUM2INT( rb_ary_entry($input, 0) ),
                                    NUM2INT( rb_ary_entry($input, 1) ) );
-              // Create a ruby object so the C++ obj is freed when GC runs
-              SWIG_NewPointerObj($1, $1_descriptor, 1);
+              tmp.reset($1); // auto destruct when method scope ends 
             }
             else
             {
@@ -436,6 +436,35 @@ module WXRuby3
           # do not seem to be virtual methods returning that
         end
 
+        # const wxVector<int>&
+
+        map 'const wxVector<int>&' => 'Array<Integer>' do
+          map_in temp: 'wxVector<int> tmp', code: <<~__CODE
+            if (($input == Qnil) || (TYPE($input) != T_ARRAY))
+            {
+              VALUE dump = rb_inspect($input);
+              rb_raise(rb_eArgError, "expected Array of Integer for %d but got %s", 
+                                     $argnum-1, StringValuePtr(dump));
+            }
+            else
+            {
+              for (int i = 0; i < RARRAY_LEN($input); i++)
+              {
+                tmp.push_back(NUM2INT(rb_ary_entry($input,i)));
+              }
+              $1 = &tmp;
+            }
+            __CODE
+          map_directorin code: <<~__CODE
+            $input = rb_ary_new();
+            for (size_t i = 0; i < $1.size(); i++)
+            {
+              rb_ary_push($input,INT2NUM( $1[i] ) );
+            }
+          __CODE
+          map_typecheck precedence: 'INT32_ARRAY', code: '$1 = (TYPE($input) == T_ARRAY);'
+        end
+
         # various enumerator type mappings
 
         map *%w[wxEdge wxRelationship wxKeyCode], as: 'Integer' do
@@ -655,7 +684,7 @@ module WXRuby3
 
         # add type mapping for wxVariant input args
         intypes = 'nil,String,Integer,Float,Time,Wx::Font,Wx::Colour,Wx::Variant,Array<WxVariant>,Array<String>,Object'
-        if Config.instance.features_set?('wxUSE_PROPGRID')
+        if Config.instance.features_set?('USE_PROPGRID')
           intypes << 'Wx::PG::ColourPropertyValue'
         end
         map 'const wxVariant&' => intypes do

data/rakelib/lib/typemap/datetime.rb

@@ -42,7 +42,7 @@ module WXRuby3
           map_directorin code: '$input = wxRuby_wxDateTimeToRuby($1);'
 
           map_typecheck precedence: 'SWIGOBJECT', code: <<~__CODE
-            $1 = rb_obj_is_kind_of($input, rb_cTime) || rb_respond_to($input, rb_intern ("to_time"));
+            $1 = NIL_P($input) || rb_obj_is_kind_of($input, rb_cTime) || rb_respond_to($input, rb_intern ("to_time"));
             __CODE
         end
 

data/rakelib/lib/typemap/tree_itemid.rb

@@ -50,7 +50,7 @@ module WXRuby3
 
           map_in temp: 'wxTreeItemId tmpId', code: <<~__CODE
             if ($input != Qnil) tmpId = _wxRuby_Unwrap_wxTreeItemId($input);
-            $1 = &tmpId;
+            $1 = tmpId;
             __CODE
 
           map_directorin code: '$input = _wxRuby_Wrap_wxTreeItemId($1);'
@@ -59,7 +59,7 @@ module WXRuby3
 
           map_directorout temp: 'wxTreeItemId tmpId', code: <<~__CODE
             if ($input != Qnil) tmpId = _wxRuby_Unwrap_wxTreeItemId($input);
-            $result = &tmpId;
+            $result = tmpId;
           __CODE
 
           map_typecheck precedence: 'POINTER', code: '$1 = _wxRuby_Is_wxTreeItemId($input);'

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

data/rakelib/yard/templates/default/tags/html/wxrb_require.erb

@@ -0,0 +1,10 @@
+<% if object.has_tag?(:wxrb_require) %>
+  <p class="tag_title">Requires:</p>
+  <ul class="wxrb-require">
+    <% wxruby_requires.each do |req| %>
+      <li><div class='inline'>
+        <%= req.join(' or ') %>
+      </div></li>
+    <% end %>
+  </ul>
+<% end %>

data/rakelib/yard/templates/default/tags/setup.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+def wxrb_require
+  erb('wxrb_require')
+end
+
+def wxruby_requires
+  object.tags(:wxrb_require).inject([]) do |list, tag|
+    tag.text.split(',').each do |feature|
+      list << feature.split('|').collect do |s|
+        s.split('&').collect { |ss| %Q[<span class="wxrb-require">#{ss.strip}</span>] }.join('&amp;')
+      end
+    end
+    list
+  end
+end

data/rakelib/yard/yard-custom-templates.rb

@@ -1,2 +1,5 @@
 
+YARD::Tags::Library.define_tag("Requirements", :wxrb_require)
+YARD::Tags::Library.visible_tags.place(:wxrb_require).before(:author)
+
 YARD::Templates::Engine.register_template_path File.join(__dir__, 'templates')