thr3ads.net - wxruby development - [Wxruby-development] [1099] trunk/wxruby2/swig/classes/XmlResource.i: Permit Dialogs and Frames with no parents to be created via XRC; add comments [Jul 2007]

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

nobody at rubyforge.org

2007-Jul-04 17:43 UTC

[Wxruby-development] [1099] trunk/wxruby2/swig/classes/XmlResource.i: Permit Dialogs and Frames with no parents to be created via XRC; add comments

<!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>[1099] trunk/wxruby2/swig/classes/XmlResource.i: Permit Dialogs and
Frames with no parents to be created via XRC; add comments</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>1099</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-07-04 13:43:19 -0400 (Wed, 04 Jul
2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Permit Dialogs and Frames with no parents to be created via XRC; add
comments</pre>

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

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2swigclassesXmlResourcei"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/classes/XmlResource.i (1098 => 1099)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/classes/XmlResource.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-07-04
16:11:23 UTC (rev 1098)
+++
trunk/wxruby2/swig/classes/XmlResource.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-07-04
17:43:19 UTC (rev 1099)
</span><span class="lines">@@ -9,12 +9,32 @@
</span><span class="cx"> #include <wx/xrc/xmlres.h>
</span><span class="cx"> %}
</span><span class="cx"> 
</span><ins>+
+// For these three methods, there are in Wx two variants. One loads an
+// XRC from scratch and returns an instance of the core Wx class:
+// Wx::Dialog, Wx::Frame, or Wx::Panel. The other loads in a layout into
+// an already existing instance of one of these classes, which may be a
+// custom ruby subclass containing extended methods etc. These two types
+// are disambiguated below.
</ins><span class="cx"> %rename(LoadDialogSubclass)
wxXmlResource::LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString
&name);
</span><span class="cx"> 
</span><span class="cx"> %rename(LoadPanelSubclass)
wxXmlResource::LoadPanel(wxPanel *pan, wxWindow *parent, wxString &name);
</span><span class="cx"> 
</span><span class="cx"> %rename(LoadFrameSubclass)
wxXmlResource::LoadFrame(wxFrame *frame, wxWindow *parent, const wxString
&name);
</span><span class="cx"> 
</span><ins>+// XmlResource is an exception to the general rule in
typemap.i - it has
+// methods which accept a ''wxWindow* parent'' argument which
may be
+// null. The standard typemap checks if the parent is NULL, but Dialogs
+// and Frames may have NULL (Ruby:nil) parents as created by XmlResource
+// LoadDialog and LoadFrame methods. So we disable that part of the
+// checking for all methods (including those which would ideally retain
+// it - eg LoadPanel - b/c no way to apply a typemap based on method
+// name in SWIG?)
+%typemap(check) wxWindow* parent {
+  if ( ! rb_const_defined(mWxruby2, rb_intern("THE_APP") ) )
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp{
rb_raise(rb_eRuntimeError,
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
"Cannot load from XRC before App.main_loop has been called");}
+}
</ins><span class="cx"> 
</span><span class="cx"> %import
"include/wxObject.h"
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>

Seemingly Similar Threads

Search for more possibly parallel threads

wxruby development - Jul 2007 - [1099] trunk/wxruby2/swig/classes/XmlResource.i: Permit Dialogs and Frames with no parents to be created via XRC; add comments

[Wxruby-development] [1099] trunk/wxruby2/swig/classes/XmlResource.i: Permit Dialogs and Frames with no parents to be created via XRC; add comments

Seemingly Similar Threads

Wisdom of the Ancients