nobody at rubyforge.org
2006-Dec-20 22:59 UTC
[Wxruby-development] [789] trunk/wxruby2/swig/classes/Window.i: Make GetChildren work (tho general fix for get_ruby_object still needed)
<!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>[789] trunk/wxruby2/swig/classes/Window.i: Make GetChildren work
(tho general fix for get_ruby_object still needed)</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>789</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2006-12-20 17:59:02 -0500 (Wed, 20 Dec
2006)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make GetChildren work (tho general fix for get_ruby_object still
needed)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2swigclassesWindowi">trunk/wxruby2/swig/classes/Window.i</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2swigclassesWindowi"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/classes/Window.i (788 => 789)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/classes/Window.i        2006-12-13
22:16:45 UTC (rev 788)
+++
trunk/wxruby2/swig/classes/Window.i        2006-12-20
22:59:02 UTC (rev 789)
</span><span class="lines">@@ -7,7 +7,6 @@
</span><span class="cx">
</span><span class="cx"> %ignore wxWindow::Clear;
</span><span class="cx"> %ignore wxWindow::GetAccessible;
</span><del>-%ignore wxWindow::GetChildren;
</del><span class="cx"> %ignore wxWindow::PopEventHandler;
</span><span class="cx"> # %ignore wxWindow::SetCaret;
</span><span class="cx">
</span><span class="lines">@@ -25,8 +24,28 @@
</span><span class="cx">
</span><span class="cx"> %apply int * INOUT { int *
x_INOUT, int * y_INOUT }
</span><span class="cx">
</span><ins>+// Typemap for GetChildren
+%typemap(out) wxList& {
+ $result = rb_ary_new();
+
+ wxNode *node = $1->GetFirst();
+ while (node)
+ {
+ wxObject *obj = node->GetData();
+ rb_ary_push($result, get_ruby_object(obj));
+ node = node->GetNext();
+ }
+}
+
+// general-purpose function used to return ruby wrappers around windows
+// whose type is not known in advance - as in find_window, get_children etc
+
+// TODO - doesn''t work correctly with object tracking - it should
return
+// the same Ruby object if the object has been seen before
+// use something like:
+//        
returnVal = SWIG_NewPointerObj(obj, SWIGTYPE_p_wxWindow, 0);
+// but this causes problems for when a new Ruby object is needed - eg with XRC
</ins><span class="cx"> %{
</span><del>-
</del><span class="cx"> static VALUE
get_ruby_object(wxObject *obj)
</span><span class="cx"> {
</span><span class="cx">
        if ( !
obj )
</span><span class="lines">@@ -38,8 +57,8 @@
</span><span class="cx">
        wxString
classNameString(obj->GetClassInfo()->GetClassName());
</span><span class="cx">
        if(classNameString.Len()
> 2)
</span><span class="cx">
        {
</span><del>-                VALUE
ruby_class = rb_iv_get(mWxruby2, classNameString.mb_str()+2);
-                returnVal
= Data_Wrap_Struct(ruby_class,0,0,obj);
</del><ins>+        
VALUE ruby_class = rb_iv_get(mWxruby2, classNameString.mb_str()+2);
+        
returnVal = Data_Wrap_Struct(ruby_class,0,0,obj);
</ins><span class="cx">
        }
</span><span class="cx">
        
</span><span class="cx">
        return
returnVal;
</span></span></pre>
</div>
</div>
</body>
</html>
Possibly Parallel Threads
- [794] trunk/wxruby2: Fix get_ruby_object so it works with SWIG tracking, move find_window_xx
- [707] trunk/wxruby2/swig/classes/Window.i: Window-paint method now implemented in Ruby (Alex Fenton)
- [895] branches/wxruby2/wxwidgets_282/swig/classes: Fix Window::GetChildren method for changes in 2.6 -> 2.8 API
- [1129] trunk/wxruby2/swig/classes/Window.i: Add DISOWN typemap for ToolTip so it isn''t double-deleted
- [744] trunk/wxruby2: get_data support & mem mgmt to all ControlWithItems types, using more
Wisdom of the Ancients
