nobody at rubyforge.org
2007-May-21 18:40 UTC
[Wxruby-development] [1026] trunk/wxruby2/swig/shared/control_with_items.i: Memory mgmt: USe __wx_destroyed__ instead of __swig_dead__; fix some
<!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>[1026] trunk/wxruby2/swig/shared/control_with_items.i: Memory mgmt:
USe __wx_destroyed__ instead of __swig_dead__; fix some</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1026</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-05-21 14:40:49 -0400 (Mon, 21 May
2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Memory mgmt: USe __wx_destroyed__ instead of __swig_dead__; fix some
compile warnings on Linux/gcc</pre>
<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2swigsharedcontrol_with_itemsi">trunk/wxruby2/swig/shared/control_with_items.i</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2swigsharedcontrol_with_itemsi"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/shared/control_with_items.i (1025 => 1026)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/shared/control_with_items.i        2007-05-21
18:40:07 UTC (rev 1025)
+++
trunk/wxruby2/swig/shared/control_with_items.i        2007-05-21
18:40:49 UTC (rev 1026)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> // Returns a ruby object stored
as client data
</span><span class="cx"> static VALUE
wxControlWithItems_get_client_data(wxControlWithItems *ptr, int n) {
</span><span class="cx">
        VALUE
returnVal = (VALUE) ptr->GetClientData(n);
</span><del>-        if
( returnVal == NULL )
</del><ins>+        if
( returnVal )
</ins><span class="cx">
         return
Qnil;
</span><span class="cx">
        return
returnVal;
</span><span class="cx"> }
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> // Checks whether the C++
object is still around first...
</span><span class="cx"> static void
mark_wxControlWithItems(void* ptr) {
</span><span class="cx">
        VALUE
rb_obj = SWIG_RubyInstanceFor(ptr);
</span><del>-        if
( rb_ivar_get(rb_obj, rb_intern("@__swig_dead__") ) == Qtrue )
</del><ins>+        if
( rb_iv_get(rb_obj, "@__wx_destroyed__" ) == Qtrue )
</ins><span class="cx">
        
return;
</span><span class="cx">
        fflush(stdout);
</span><span class="cx">
        
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
        for (int
i = 0; i < count; ++i)
</span><span class="cx">
         {
</span><span class="cx">
                VALUE
object = (VALUE) wx_cwi->GetClientData(i);
</span><del>-                if
( object != NULL && object != Qnil )
</del><ins>+                if
( object && object != Qnil )
</ins><span class="cx">
                
{
</span><span class="cx">
                        rb_gc_mark(object);
</span><span class="cx">
                
}
</span></span></pre>
</div>
</div>
</body>
</html>
Possibly Parallel Threads
- [744] trunk/wxruby2: get_data support & mem mgmt to all ControlWithItems types, using more
- [1133] trunk/wxruby2/swig/shared/control_with_items.i: Move mark func for ControlWithItems into shared file so changes affect
- [722] trunk/wxruby2/swig: Wx::Choice fixes for get_client_data (AF)
- [1125] trunk/wxruby2/swig/shared/control_with_items.i: Avoid MSW crashes when unexpected object is returned by SWIG tracking
- [889] branches/wxruby2/wxwidgets_282/swig/shared/control_with_items.i: Ensure SWIG doesn''t generate wrappers for client data methods (Artur Kuptel)
Wisdom of the Ancients
