nobody at rubyforge.org
2007-Jul-21 15:50 UTC
[Wxruby-development] [1133] trunk/wxruby2/swig/shared/control_with_items.i: Move mark func for ControlWithItems into shared file so changes affect
<!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>[1133] trunk/wxruby2/swig/shared/control_with_items.i: Move mark
func for ControlWithItems into shared file so changes affect</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1133</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-07-21 11:50:04 -0400 (Sat, 21 Jul
2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move mark func for ControlWithItems into shared file so changes
affect
all classes using it and it''s only compiled once</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 (1132 => 1133)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/shared/control_with_items.i        2007-07-21
13:36:21 UTC (rev 1132)
+++
trunk/wxruby2/swig/shared/control_with_items.i        2007-07-21
15:50:04 UTC (rev 1133)
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx">
</span><span class="cx"> %{
</span><span class="cx"> extern swig_class
cWxControlWithItems;
</span><ins>+ extern void mark_wxControlWithItems(void* ptr);
</ins><span class="cx">
</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="lines">@@ -19,33 +20,4 @@
</span><span class="cx">
         return
Qnil;
</span><span class="cx">
        return
returnVal;
</span><span class="cx"> }
</span><del>-
- // Prevents Ruby''s GC sweeping up items that are stored as client
data
- // Checks whether the C++ object is still around first...
- static void mark_wxControlWithItems(void* ptr) {
-        VALUE
rb_obj = SWIG_RubyInstanceFor(ptr);
-        if (
rb_iv_get(rb_obj, "@__wx_destroyed__" ) == Qtrue )
-        
return;
-
-        // On
Windows, sometimes the wrong object is associated with the
-        // ptr,
so we check whether it is the right one to avoid crashes
-        if ( !
rb_obj_is_kind_of(rb_obj, cWxControlWithItems.klass) )
-        
return;
-
-        wxControlWithItems*
wx_cwi = (wxControlWithItems*) ptr;
-        int
count = wx_cwi->GetCount();
-        if (
count == 0 )
-        
return;
-
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);
-                
}
-         }
- }
</del><span class="cx"> %}
</span></span></pre>
</div>
</div>
</body>
</html>
Maybe Matching Threads
- [1125] trunk/wxruby2/swig/shared/control_with_items.i: Avoid MSW crashes when unexpected object is returned by SWIG tracking
- [1026] trunk/wxruby2/swig/shared/control_with_items.i: Memory mgmt: USe __wx_destroyed__ instead of __swig_dead__; fix some
- [722] trunk/wxruby2/swig: Wx::Choice fixes for get_client_data (AF)
- [744] trunk/wxruby2: get_data support & mem mgmt to all ControlWithItems types, using more
- [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
