nobody at rubyforge.org
2007-Jul-20 08:58 UTC
[Wxruby-development] [1123] trunk/wxruby2/swig/wx.i: Check sizers being marked have a ruby rep and are not internal Wx-only,
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type"
content="text/html; charset=utf-8" /><style
type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:'':'';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family:
verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;
font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding:
6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid;
padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family:
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch
.binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[1123] trunk/wxruby2/swig/wx.i: Check sizers being marked have a
ruby rep and are not internal Wx-only,</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1123</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-07-20 04:58:51 -0400 (Fri, 20 Jul
2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check sizers being marked have a ruby rep and are not internal
Wx-only,
fixing crasher in GTK PageSetupDialog</pre>
<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2swigwxi">trunk/wxruby2/swig/wx.i</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2swigwxi"></a>
<div class="modfile"><h4>Modified: trunk/wxruby2/swig/wx.i
(1122 => 1123)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/wx.i        2007-07-19
22:31:26 UTC (rev 1122)
+++
trunk/wxruby2/swig/wx.i        2007-07-20
08:58:51 UTC (rev 1123)
</span><span class="lines">@@ -36,7 +36,8 @@
</span><span class="cx"> void GC_SetWindowDeleted(void
*ptr)
</span><span class="cx"> {
</span><span class="cx"> VALUE rb_win =
SWIG_RubyInstanceFor(ptr);
</span><del>- rb_ivar_set(rb_win, wx_destroyed_sym, Qtrue);
</del><ins>+ if ( rb_win != Qnil )
+        rb_ivar_set(rb_win,
wx_destroyed_sym, Qtrue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Carries out marking of Sizer
objects belonging to a Wx::Window. Note
</span><span class="lines">@@ -45,10 +46,10 @@
</span><span class="cx"> // not those picked up as marked
by in-scope variables by
</span><span class="cx"> // Ruby. Otherwise, segfaults may
result. Because Sizers are SWIG
</span><span class="cx"> // directors, they must be
preserved from GC.
</span><del>-void GC_mark_SizerBelongingToWindow(wxSizer *wx_sizer)
</del><ins>+void GC_mark_SizerBelongingToWindow(wxSizer *wx_sizer,
VALUE rb_sizer)
</ins><span class="cx"> {
</span><span class="cx"> // First, mark this sizer
</span><del>- rb_gc_mark( SWIG_RubyInstanceFor(wx_sizer) );
</del><ins>+ rb_gc_mark( rb_sizer );
</ins><span class="cx">
</span><span class="cx"> // Then loop over hte
sizer''s content and mark each sub-sizer in turn
</span><span class="cx"> wxSizerItemList& children =
wx_sizer->GetChildren();
</span><span class="lines">@@ -59,7 +60,11 @@
</span><span class="cx">
        
wxSizerItem* item = node->GetData();
</span><span class="cx">
        
wxSizer* child_sizer = item->GetSizer();
</span><span class="cx">
         if (
child_sizer )
</span><del>-                {
GC_mark_SizerBelongingToWindow(child_sizer); }
</del><ins>+                {
+                
VALUE rb_child_sizer = SWIG_RubyInstanceFor(child_sizer);
+                
if ( rb_child_sizer != Qnil )
+                        {
GC_mark_SizerBelongingToWindow(child_sizer, rb_child_sizer); }
+                }
</ins><span class="cx">
        }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -95,7 +100,9 @@
</span><span class="cx"> wxSizer* wx_sizer =
wx_win->GetSizer();
</span><span class="cx"> if ( wx_sizer )
</span><span class="cx">
        {
</span><del>-        
GC_mark_SizerBelongingToWindow(wx_sizer);
</del><ins>+        
VALUE rb_sizer = SWIG_RubyInstanceFor(wx_sizer);
+         if (
rb_sizer != Qnil )
+                GC_mark_SizerBelongingToWindow(wx_sizer,
rb_sizer);
</ins><span class="cx">
        }
</span><span class="cx">
</span><span class="cx"> wxCaret* wx_caret =
wx_win->GetCaret();
</span></span></pre>
</div>
</div>
</body>
</html>
Apparently Analagous Threads
- [1127] trunk/wxruby2: Move shared C++ GC functions into separate file included into wx.i
- [1135] trunk/wxruby2/swig/mark_free_impl.i: Convert from DOS to Unix newlines
- [1108] trunk/wxruby2/swig: Revised mem mgmt for Sizers to address more GC crashes in Sizers demo
- [1032] trunk/wxruby2/swig: Preserve Sizers associated with Windows from GC; fix several sample
- [1033] trunk/wxruby2/swig: GC fixes for nested sizers; fix crashes in html.rb demo
Wisdom of the Ancients
