nobody at rubyforge.org
2007-Mar-18 10:29 UTC
[Wxruby-development] [895] branches/wxruby2/wxwidgets_282/swig/classes: Fix Window::GetChildren method for changes in 2.6 -> 2.8 API
<!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>[895] branches/wxruby2/wxwidgets_282/swig/classes: Fix Window::GetChildren method for changes in 2.6 -> 2.8 API</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>895</dd> <dt>Author</dt> <dd>brokentoy</dd> <dt>Date</dt> <dd>2007-03-18 06:29:32 -0400 (Sun, 18 Mar 2007)</dd> </dl> <h3>Log Message</h3> <pre>Fix Window::GetChildren method for changes in 2.6 -> 2.8 API</pre> <h3>Modified Paths</h3> <ul> <li><a href="#brancheswxruby2wxwidgets_282swigclassesWindowi">branches/wxruby2/wxwidgets_282/swig/classes/Window.i</a></li> <li><a href="#brancheswxruby2wxwidgets_282swigclassesincludewxWindowh">branches/wxruby2/wxwidgets_282/swig/classes/include/wxWindow.h</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="brancheswxruby2wxwidgets_282swigclassesWindowi"></a> <div class="modfile"><h4>Modified: branches/wxruby2/wxwidgets_282/swig/classes/Window.i (894 => 895)</h4> <pre class="diff"><span> <span class="info">--- branches/wxruby2/wxwidgets_282/swig/classes/Window.i        2007-03-18 10:16:02 UTC (rev 894) +++ branches/wxruby2/wxwidgets_282/swig/classes/Window.i        2007-03-18 10:29:32 UTC (rev 895) </span><span class="lines">@@ -32,10 +32,10 @@ </span><span class="cx"> %apply int * INOUT { int * x_INOUT, int * y_INOUT } </span><span class="cx"> </span><span class="cx"> // Typemap for GetChildren - casts wxObjects to correct ruby wrappers </span><del>-%typemap(out) wxList& { </del><ins>+%typemap(out) wxWindowList& { </ins><span class="cx"> $result = rb_ary_new(); </span><span class="cx"> </span><del>- wxNode *node = $1->GetFirst(); </del><ins>+ wxWindowListNode *node = $1->GetFirst(); </ins><span class="cx"> while (node) </span><span class="cx"> { </span><span class="cx"> wxObject *obj = node->GetData(); </span></span></pre></div> <a id="brancheswxruby2wxwidgets_282swigclassesincludewxWindowh"></a> <div class="modfile"><h4>Modified: branches/wxruby2/wxwidgets_282/swig/classes/include/wxWindow.h (894 => 895)</h4> <pre class="diff"><span> <span class="info">--- branches/wxruby2/wxwidgets_282/swig/classes/include/wxWindow.h        2007-03-18 10:16:02 UTC (rev 894) +++ branches/wxruby2/wxwidgets_282/swig/classes/include/wxWindow.h        2007-03-18 10:29:32 UTC (rev 895) </span><span class="lines">@@ -56,7 +56,7 @@ </span><span class="cx"> static wxWindow * GetCapture() ; </span><span class="cx"> virtual int GetCharHeight() const; </span><span class="cx"> virtual int GetCharWidth() const; </span><del>- wxList& GetChildren() ; </del><ins>+ wxWindowList& GetChildren() ; </ins><span class="cx"> void GetClientSize(int* width , int* height ) const; </span><span class="cx"> wxSize GetClientSize() const; </span><span class="cx"> wxLayoutConstraints* GetConstraints() const; </span></span></pre> </div> </div> </body> </html>
Reasonably Related Threads
- [789] trunk/wxruby2/swig/classes/Window.i: Make GetChildren work (tho general fix for get_ruby_object still needed)
- [998] branches/wxruby2/wxwidgets_282/swig/classes/Window.i: Additional %ignore needed for Wx::Window in 2.8
- [973] branches/wxruby2/wxwidgets_282/swig/classes/Window.i: Fix crasher with Window#get_handle, also comment the paint method
- [910] branches/wxruby2/wxwidgets_282: Moved paint() method back into C++, so DC object is destroyed in timely
- [897] branches/wxruby2/wxwidgets_282/swig/classes/Window.i: DISOWN typemap to prevent crash on GC/exit when caret has been set (bug #9093)