thr3ads.net - wxruby development - [Wxruby-development] [1140] trunk/wxruby2/swig/mark_free_impl.i: Remove instance variable marking of deleted Wx Windows because it''s redundant [Jul 2007]

If this information is useful, please help other people find it:
Share via:

nobody at rubyforge.org

2007-Jul-22 23:08 UTC

[Wxruby-development] [1140] trunk/wxruby2/swig/mark_free_impl.i: Remove instance variable marking of deleted Wx Windows because it''s redundant

<!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>[1140] trunk/wxruby2/swig/mark_free_impl.i: Remove instance
variable marking of deleted Wx Windows because it''s
redundant</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>1140</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-07-22 19:08:52 -0400 (Sun, 22 Jul
2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove instance variable marking of deleted Wx Windows because
it''s redundant</pre>

<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2swigmark_free_impli">trunk/wxruby2/swig/mark_free_impl.i</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2swigmark_free_impli"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/mark_free_impl.i (1139 => 1140)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/mark_free_impl.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-07-21
16:51:02 UTC (rev 1139)
+++
trunk/wxruby2/swig/mark_free_impl.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-07-22
23:08:52 UTC (rev 1140)
</span><span class="lines">@@ -8,8 +8,6 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> %{
</span><del>-static VALUE wx_destroyed_sym =
rb_intern("@__wx_destroyed__");
-
</del><span class="cx"> // Code to be run when the ruby
object is swept by GC - this only
</span><span class="cx"> // unlinks the C++ object from
the ruby VALUE but doesn''t delete
</span><span class="cx"> // it because it is still needed
and will be managed by WxWidgets.
</span><span class="lines">@@ -23,9 +21,7 @@
</span><span class="cx"> bool GC_IsWindowDeleted(void
*ptr)
</span><span class="cx"> {
</span><span class="cx">   // If objects have been
''unlinked'' then DATA_PTR = 0
</span><del>-  if ( ! ptr ) return true;
-  VALUE rb_win = SWIG_RubyInstanceFor(ptr);
-  if ( rb_ivar_defined(rb_win, wx_destroyed_sym ) )
</del><ins>+  if ( ! ptr ) 
</ins><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspreturn
true;
</span><span class="cx">   else
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspreturn
false;
</span><span class="lines">@@ -35,13 +31,8 @@
</span><span class="cx"> // WindowDestroyEvent handled by
wxRubyApp
</span><span class="cx"> void GC_SetWindowDeleted(void
*ptr)
</span><span class="cx"> {
</span><del>-  VALUE rb_win = SWIG_RubyInstanceFor(ptr);
-  if ( rb_win != Qnil )
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp{
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp 
rb_ivar_set(rb_win, wx_destroyed_sym, Qtrue);
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp 
SWIG_RubyUnlinkObjects(ptr);
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp 
SWIG_RubyRemoveTracking(ptr);
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp}
</del><ins>+  SWIG_RubyUnlinkObjects(ptr);
+  SWIG_RubyRemoveTracking(ptr);
</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></pre>
</div>
</div>

</body>
</html>

Seemingly Similar Threads

Search for more maybe matching threads

wxruby development - Jul 2007 - [1140] trunk/wxruby2/swig/mark_free_impl.i: Remove instance variable marking of deleted Wx Windows because it''s redundant

[Wxruby-development] [1140] trunk/wxruby2/swig/mark_free_impl.i: Remove instance variable marking of deleted Wx Windows because it''s redundant

Seemingly Similar Threads

Wisdom of the Ancients