thr3ads.net - wxruby development - [Wxruby-development] [1047] trunk/wxruby2/swig/classes/ListCtrl.i: Prevent crashes in ListCtrl from premature deletion of associated ImageList [Jun 2007]

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

nobody at rubyforge.org

2007-Jun-05 20:06 UTC

[Wxruby-development] [1047] trunk/wxruby2/swig/classes/ListCtrl.i: Prevent crashes in ListCtrl 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>[1047] trunk/wxruby2/swig/classes/ListCtrl.i: Prevent crashes in
ListCtrl from premature deletion of associated ImageList</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>1047</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-06-05 16:06:45 -0400 (Tue, 05 Jun
2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Prevent crashes in ListCtrl from premature deletion of associated
ImageList</pre>

<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2swigclassesListCtrli">trunk/wxruby2/swig/classes/ListCtrl.i</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2swigclassesListCtrli"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/classes/ListCtrl.i (1046 => 1047)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/classes/ListCtrl.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-06-05
20:06:13 UTC (rev 1046)
+++
trunk/wxruby2/swig/classes/ListCtrl.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-06-05
20:06:45 UTC (rev 1047)
</span><span class="lines">@@ -6,18 +6,22 @@
</span><span class="cx"> %{
</span><span class="cx"> #include <wx/wx.h>
</span><span class="cx"> #include <wx/listctrl.h>
</span><ins>+#include <wx/imaglist.h>
</ins><span class="cx"> %}
</span><span class="cx"> 
</span><span class="cx"> %module(directors="1")
wxListCtrl
</span><span class="cx"> GC_MANAGE_AS_WINDOW(wxListCtrl);
</span><span class="cx"> 
</span><ins>+// default constructor
</ins><span class="cx"> %ignore wxListCtrl::wxListCtrl();
</span><del>-//
</del><ins>+
+// Ruby handles memory management - always use SetImageList
+%ignore wxListCtrl::AssignImageList;
+
</ins><span class="cx"> // Doesn''t work on wxMac
</span><del>-//
</del><span class="cx"> %ignore
wxListCtrl::GetEditControl;
</span><span class="cx"> 
</span><del>-# deprecated:
</del><ins>+// deprecated:
</ins><span class="cx"> %ignore
wxListCtrl::GetItemSpacing(bool isSmall) const;
</span><span class="cx"> 
</span><span class="cx"> // dealt with below
</span><span class="lines">@@ -73,6 +77,17 @@
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp 
return;
</span><span class="cx"> 
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspwxListCtrl*
wx_lc = (wxListCtrl*) ptr;
</span><ins>+
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp//
First check if there''s ImageLists and mark if found
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspwxImageList*
img_list;
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspimg_list=
wx_lc->GetImageList(wxIMAGE_LIST_NORMAL);
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif (
img_list ) rb_gc_mark(SWIG_RubyInstanceFor(img_list));
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspimg_list=
wx_lc->GetImageList(wxIMAGE_LIST_SMALL);
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif (
img_list ) rb_gc_mark(SWIG_RubyInstanceFor(img_list));
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspimg_list=
wx_lc->GetImageList(wxIMAGE_LIST_STATE);
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif (
img_list ) rb_gc_mark(SWIG_RubyInstanceFor(img_list));
+
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp//
Don''t try to mark item data for VIRTUAL listctrls
</ins><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif (
wx_lc->GetWindowStyle() & wxLC_VIRTUAL )
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp 
return;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>

wxruby development - Jun 2007 - [1047] trunk/wxruby2/swig/classes/ListCtrl.i: Prevent crashes in ListCtrl from premature deletion of associated ImageList

[Wxruby-development] [1047] trunk/wxruby2/swig/classes/ListCtrl.i: Prevent crashes in ListCtrl from premature deletion of associated ImageList