thr3ads.net - wxruby development - [Wxruby-development] [722] trunk/wxruby2/swig: Wx::Choice fixes for get_client

If this information is useful, please help other people find it:
Share via:
nobody at rubyforge.org
2006-Nov-07 21:30 UTC
[Wxruby-development] [722] trunk/wxruby2/swig: Wx::Choice fixes for get_client_data (AF)

<!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>[722] trunk/wxruby2/swig: Wx::Choice fixes for get_client_data
(AF)</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>722</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2006-11-07 16:30:46 -0500 (Tue, 07 Nov
2006)</dd>
</dl>

<h3>Log Message</h3>
<pre>Wx::Choice fixes for get_client_data (AF)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2swigclassesChoicei">trunk/wxruby2/swig/classes/Choice.i</a></li>
<li><a
href="#trunkwxruby2swigfixdeletingrb">trunk/wxruby2/swig/fixdeleting.rb</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/wxruby2/swig/shared/</li>
<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="trunkwxruby2swigclassesChoicei"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/classes/Choice.i (721 => 722)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/classes/Choice.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2006-11-04
10:27:27 UTC (rev 721)
+++
trunk/wxruby2/swig/classes/Choice.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2006-11-07
21:30:46 UTC (rev 722)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-#   Copyright 2004-2005 by Kevin Smith
</del><ins>+#   Copyright 2004-2006 by Kevin Smith
</ins><span class="cx"> #   released under the MIT-style
wxruby2 license
</span><span class="cx"> 
</span><span class="cx"> %include "../common.i"
</span><span class="lines">@@ -27,9 +27,26 @@
</span><span class="cx">               long style = 0,
</span><span class="cx">               const
wxValidator& validator = wxDefaultValidator,
</span><span class="cx">               const wxString&
name = wxChoiceNameStr);
</span><del>-  
</del><span class="cx"> 
</span><span class="cx"> 
</span><ins>+// start client_data fixes
+%include "../shared/control_with_items.i"
+%markfunc wxChoice "mark_wxControlWithItems";
+
+%ignore wxChoice::GetClientData(int n) const;
+%ignore wxChoice::GetClientObject(int n) const;
+%extend wxChoice {
+  VALUE get_client_data(int n)
+  {
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspVALUE
returnVal = (VALUE) self->GetClientData(n);
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif (
returnVal == NULL )
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp 
return Qnil;
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspreturn
returnVal;
+  }
+}
+
+// end client_data fix
+
</ins><span class="cx"> %import
"include/wxObject.h"
</span><span class="cx"> %import
"include/wxEvtHandler.h"
</span><span class="cx"> %import
"include/wxWindow.h"
</span></span></pre></div>
<a id="trunkwxruby2swigfixdeletingrb"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/fixdeleting.rb (721 => 722)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/fixdeleting.rb&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2006-11-04
10:27:27 UTC (rev 721)
+++
trunk/wxruby2/swig/fixdeleting.rb&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2006-11-07
21:30:46 UTC (rev 722)
</span><span class="lines">@@ -69,6 +69,8 @@
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsplines
<< ''    printf("'' + this_module + ''"
" ~Director %p\n", this);''
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsplines
<< ''    fflush(stdout);''
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsplines
<< ''#endif''
</span><ins>+            lines << ''    VALUE rb_obj =
GcGetValueFromPtr(this);''
+            lines << ''    rb_ivar_set(rb_obj,
rb_intern("@__swig_dead__"), Qtrue);''
</ins><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsplines
<< ''    GcMarkDeleted(this);''
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspline
= lines.join("\n")
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspfound_director_destructor
= true
</span></span></pre></div>
<a id="trunkwxruby2swigsharedcontrol_with_itemsi"></a>
<div class="addfile"><h4>Added:
trunk/wxruby2/swig/shared/control_with_items.i (0 => 722)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/shared/control_with_items.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
(rev 0)
+++
trunk/wxruby2/swig/shared/control_with_items.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2006-11-07
21:30:46 UTC (rev 722)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+# Copyright 2004-2006 by Kevin Smith
+# Released under the MIT-style wxruby2 license
+
+// 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) {
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspVALUE
rb_obj = SWIG_RubyInstanceFor(ptr);
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif (
rb_ivar_get(rb_obj, rb_intern("@__swig_dead__") ) == Qtrue )
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp 
return;
+
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspwxControlWithItems*
wx_cwi = (wxControlWithItems*) ptr;
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspint
count = wx_cwi->GetCount();
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif (
count == 0 )
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp 
return;
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspfor
(int i = 0; i < count; ++i)
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp  {
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspVALUE
object = (VALUE) wx_cwi->GetClientData(i);
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif
( object != NULL && object != Qnil )
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
{
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsprb_gc_mark(object);
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
}
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp  }
+  }
+%}
</ins></span></pre>
</div>
</div>

</body>
</html>
Seemingly Similar Threads

Search for more seemingly similar threads
wxruby development - Nov 2006 - [722] trunk/wxruby2/swig: Wx::Choice fixes for get_client_data (AF)

[Wxruby-development] [722] trunk/wxruby2/swig: Wx::Choice fixes for get_client_data (AF)

Seemingly Similar Threads

Wisdom of the Ancients
