nobody at rubyforge.org
2007-May-22 08:20 UTC
[Wxruby-development] [1029] trunk/wxruby2/swig/classes/MenuBar.i: Add special GC protection for Wx::Menu to prevent premature destruction
<!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>[1029] trunk/wxruby2/swig/classes/MenuBar.i: Add special GC
protection for Wx::Menu to prevent premature destruction</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1029</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-05-22 04:20:06 -0400 (Tue, 22 May
2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add special GC protection for Wx::Menu to prevent premature
destruction</pre>
<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2swigclassesMenuBari">trunk/wxruby2/swig/classes/MenuBar.i</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2swigclassesMenuBari"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/classes/MenuBar.i (1028 => 1029)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/classes/MenuBar.i        2007-05-22
08:09:51 UTC (rev 1028)
+++
trunk/wxruby2/swig/classes/MenuBar.i        2007-05-22
08:20:06 UTC (rev 1029)
</span><span class="lines">@@ -4,12 +4,37 @@
</span><span class="cx"> %include "../common.i"
</span><span class="cx">
</span><span class="cx"> %module(directors="1")
wxMenuBar
</span><del>-GC_MANAGE_AS_OBJECT(wxMenuBar);
</del><ins>+GC_MANAGE_AS_WINDOW(wxMenuBar);
</ins><span class="cx">
</span><del>-%ignore wxMenuBar(int n , wxMenu* menus[] , const
wxString titles[] ) ;
</del><ins>+%ignore wxMenuBar(int n , wxMenu* menus[] , const
wxString titles[] ) ;
</ins><span class="cx">
</span><ins>+// MenuBar requires a special mark routine. This is
because Wx::Menu is
+// not a subclass of Window so isn''t automatically protected in the
mark
+// phase by Wx::App. However, the ruby object still must not be
+// destroyed while the Menu is still accessible on screen, because it
+// may be required to handle events.
+%{
+void mark_wxMenuBar(void *ptr)
+{
+ VALUE rb_win = SWIG_RubyInstanceFor(ptr);
+ if ( rb_iv_get(rb_win, "@__wx_destroyed__") == Qtrue )
+        
return;
</ins><span class="cx">
</span><ins>+ wxMenuBar* menu_bar = (wxMenuBar*)ptr;
+ // Mark each menu in the menubar in turn
+ for ( int i = 0; i < menu_bar->GetMenuCount(); i++ )
+        {
+        
wxMenu* menu = menu_bar->GetMenu(i);
+         VALUE
rb_menu = SWIG_RubyInstanceFor(menu);
+        
rb_gc_mark(rb_menu);
+        }
+}
+%}
+
+%markfunc wxMenuBar "mark_wxMenuBar";
+
</ins><span class="cx"> %import
"include/wxObject.h"
</span><span class="cx"> %import
"include/wxEvtHandler.h"
</span><ins>+%import "include/wxWindow.h"
</ins><span class="cx">
</span><span class="cx"> %include
"include/wxMenuBar.h"
</span></span></pre>
</div>
</div>
</body>
</html>
Possibly Parallel Threads
- [1109] trunk/wxruby2/swig: Move marking of MenuBar from direct %markfunc to via mark_wxFrame, so
- [1135] trunk/wxruby2/swig/mark_free_impl.i: Convert from DOS to Unix newlines
- [1127] trunk/wxruby2: Move shared C++ GC functions into separate file included into wx.i
- loading menu using XmlResource
- [1134] trunk/wxruby2/swig/mark_free_impl.i: When window is deleted, unhook ruby obj from DATA_PTR to avoid MSW crashes
Wisdom of the Ancients
