nobody at rubyforge.org
2007-Jun-25 23:57 UTC
[Wxruby-development] [1072] trunk/wxruby2/swig/shared/datetime.i: Add typemap for DateTime::WeekDay; plug mem leak with wxDateTime arg
<!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>[1072] trunk/wxruby2/swig/shared/datetime.i: Add typemap for
DateTime::WeekDay; plug mem leak with wxDateTime arg</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1072</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-06-25 19:57:35 -0400 (Mon, 25 Jun
2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add typemap for DateTime::WeekDay; plug mem leak with wxDateTime
arg</pre>
<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2swigshareddatetimei">trunk/wxruby2/swig/shared/datetime.i</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2swigshareddatetimei"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/shared/datetime.i (1071 => 1072)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/shared/datetime.i        2007-06-25
23:56:34 UTC (rev 1071)
+++
trunk/wxruby2/swig/shared/datetime.i        2007-06-25
23:57:35 UTC (rev 1072)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> #include <wx/datetime.h>
</span><span class="cx"> %}
</span><span class="cx">
</span><del>-%typemap(in) const wxDateTime& {
</del><ins>+%typemap(in) wxDateTime& {
</ins><span class="cx"> int y =
NUM2INT(rb_funcall($input, rb_intern("year"), 0));
</span><span class="cx"> int rMonth =
NUM2INT(rb_funcall($input, rb_intern("month"), 0));
</span><span class="cx"> int rDay =
NUM2INT(rb_funcall($input, rb_intern("mday"), 0));
</span><span class="lines">@@ -20,6 +20,8 @@
</span><span class="cx">
        $1 = new
wxDateTime(d, mon, y, h, min, s, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+%typemap(freearg) wxDateTime& "if ( argc >
$argnum - 2 ) delete $1;"
+
</ins><span class="cx"> %typemap(out) wxDateTime& {
</span><span class="cx"> VALUE y =
INT2NUM($1->GetYear());
</span><span class="cx"> VALUE mon =
INT2NUM($1->GetMonth() + 1);
</span><span class="lines">@@ -29,11 +31,14 @@
</span><span class="cx"> VALUE s =
INT2NUM($1->GetSecond());
</span><span class="cx">
</span><span class="cx"> VALUE cTime =
rb_iv_get(rb_cObject, "Time");
</span><del>- // $result = rb_funcall(cDateTime,
rb_intern("new"), 6, y, mon, d, h, min, s);
</del><ins>+
</ins><span class="cx"> $result = rb_funcall(cTime,
rb_intern("local"), 6, y, mon, d, h, min, s);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Need to have this to over-ride
the default which does not work
</span><del>-%typemap(typecheck) const wxDateTime& {
</del><ins>+%typemap(typecheck) wxDateTime& {
</ins><span class="cx">
        $1 =
(TYPE($input) != T_NONE);
</span><span class="cx"> }
</span><ins>+
+%typemap(in) wxDateTime::WeekDay "$1 =
(wxDateTime::WeekDay)NUM2INT($input);"
+%typemap(out) wxDateTime::WeekDay "$result = INT2NUM($1);"
</ins></span></pre>
</div>
</div>
</body>
</html>
Apparently Analagous Threads
- [961] branches/wxruby2/wxwidgets_282/swig: Move wxDateTime typemap into shared file, map to core Time class instead
- [1080] trunk/wxruby2/swig: Moved typemaps specific to SystemSetting out of general typemap file
- Fwd: win32-service problems with patch
- [1084] trunk/wxruby2/swig/classes/SystemSettings.i: Fix missing punctuation in SystemSettings typemaps
- [756] trunk/wxruby2/swig: Moved one-shot typemaps for ListBox.get_selections into ListBox.i
