nobody at rubyforge.org
2007-Jun-05 20:06 UTC
[Wxruby-development] [1046] trunk/wxruby2/swig/classes/TreeCtrl.i: Prevent crashes in TreeCtrl from premature deletion of associated ImageList
<!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>[1046] trunk/wxruby2/swig/classes/TreeCtrl.i: Prevent crashes in TreeCtrl from premature deletion of associated ImageList</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1046</dd> <dt>Author</dt> <dd>brokentoy</dd> <dt>Date</dt> <dd>2007-06-05 16:06:13 -0400 (Tue, 05 Jun 2007)</dd> </dl> <h3>Log Message</h3> <pre>Prevent crashes in TreeCtrl from premature deletion of associated ImageList</pre> <h3>Modified Paths</h3> <ul> <li><a href="#trunkwxruby2swigclassesTreeCtrli">trunk/wxruby2/swig/classes/TreeCtrl.i</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="trunkwxruby2swigclassesTreeCtrli"></a> <div class="modfile"><h4>Modified: trunk/wxruby2/swig/classes/TreeCtrl.i (1045 => 1046)</h4> <pre class="diff"><span> <span class="info">--- trunk/wxruby2/swig/classes/TreeCtrl.i        2007-06-05 20:05:22 UTC (rev 1045) +++ trunk/wxruby2/swig/classes/TreeCtrl.i        2007-06-05 20:06:13 UTC (rev 1046) </span><span class="lines">@@ -13,6 +13,10 @@ </span><span class="cx"> // wxTreeItemId fixes - these typemaps convert them to ruby Integers </span><span class="cx"> %include "../shared/treeitemid_typemaps.i" </span><span class="cx"> </span><ins>+%ignore wxTreeCtrl::AssignImageList; +%ignore wxTreeCtrl::AssignButtonsImageList; +%ignore wxTreeCtrl::AssignStateImageList; + </ins><span class="cx"> // ITEM DATA fixes - This is done so the API user never sees a </span><span class="cx"> // TreeItemData object - where in Wx C++ such an object </span><span class="cx"> // would be passed or returned by a method, any Ruby object may be used. </span><span class="lines">@@ -92,6 +96,17 @@ </span><span class="cx">          return; </span><span class="cx"> </span><span class="cx">         wxTreeCtrl* tree_ctrl = (wxTreeCtrl*) ptr; </span><ins>+ +        wxImageList* img_list; +        // First check if there''s ImageLists and mark if found +        img_list = tree_ctrl->GetImageList(); +        if ( img_list ) rb_gc_mark(SWIG_RubyInstanceFor(img_list)); +        img_list = tree_ctrl->GetButtonsImageList(); +        if ( img_list ) rb_gc_mark(SWIG_RubyInstanceFor(img_list)); +        img_list = tree_ctrl->GetStateImageList(); +        if ( img_list ) rb_gc_mark(SWIG_RubyInstanceFor(img_list)); + +        // Now mark the item data </ins><span class="cx">         wxTreeItemId root_id = tree_ctrl->GetRootItem(); </span><span class="cx">         RecurseOverTreeIds(tree_ctrl, root_id, &DoGCMarkItemData); </span><span class="cx"> } </span></span></pre> </div> </div> </body> </html>
Reasonably Related Threads
- [1089] trunk/wxruby2/swig/classes/TreeCtrl.i: Hide missing method call in TreeCtrl on Win32
- [779] trunk/wxruby2: Added TreeCtrl#traverse method and documentation
- [1137] trunk/wxruby2/swig/classes/TreeCtrl.i: Call correct shared function to check whether TreeCtrl is deleted in markfunc
- [797] trunk/wxruby2/swig/classes/TreeCtrl.i: Traverse method moved to wxSugar
- [741] trunk/wxruby2: Fix get_item_data, hiding TreeItemData messiness, fix GC-ing (Alex Fenton)