nobody at rubyforge.org
2007-Jan-05 21:43 UTC
[Wxruby-development] [827] trunk/wxruby2/swig: Moved NULL objects into constants so they can be used for default args
<!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>[827] trunk/wxruby2/swig: Moved NULL objects into constants so they
can be used for default args</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>827</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-01-05 16:43:19 -0500 (Fri, 05 Jan
2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Moved NULL objects into constants so they can be used for default
args</pre>
<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2swigRubyConstantsi">trunk/wxruby2/swig/RubyConstants.i</a></li>
<li><a
href="#trunkwxruby2swigRubyStockObjectsi">trunk/wxruby2/swig/RubyStockObjects.i</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2swigRubyConstantsi"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/RubyConstants.i (826 => 827)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/RubyConstants.i        2007-01-05
21:11:50 UTC (rev 826)
+++
trunk/wxruby2/swig/RubyConstants.i        2007-01-05
21:43:19 UTC (rev 827)
</span><span class="lines">@@ -2145,6 +2145,17 @@
</span><span class="cx"> %constant const wxPoint
DEFAULT_POSITION = wxDefaultPosition;
</span><span class="cx"> %constant const wxValidator
DEFAULT_VALIDATOR = wxDefaultValidator;
</span><span class="cx">
</span><ins>+
+// ''Null'' objects
+%constant wxBitmap const NULL_BITMAP = wxNullBitmap;
+%constant wxIcon const NULL_ICON = wxNullIcon;
+%constant wxCursor const NULL_CURSOR = wxNullCursor;
+%constant wxPen const NULL_PEN = wxNullPen;
+%constant wxBrush const NULL_BRUSH = wxNullBrush;
+%constant wxPalette const NULL_PALETTE = wxNullPalette;
+%constant wxFont const NULL_FONT = wxNullFont;
+%constant wxColour const NULL_COLOUR = wxNullColour;
+
</ins><span class="cx"> // Text font families
</span><span class="cx"> %constant int FONTFAMILY_DEFAULT
= wxDEFAULT;
</span><span class="cx"> %constant int
FONTFAMILY_DECORATIVE = wxDECORATIVE;
</span></span></pre></div>
<a id="trunkwxruby2swigRubyStockObjectsi"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/RubyStockObjects.i (826 => 827)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/RubyStockObjects.i        2007-01-05
21:11:50 UTC (rev 826)
+++
trunk/wxruby2/swig/RubyStockObjects.i        2007-01-05
21:43:19 UTC (rev 827)
</span><span class="lines">@@ -1,8 +1,14 @@
</span><del>-# Copyright 2004-2005 by Kevin Smith
-# released under the MIT-style wxruby2 license
</del><ins>+// Copyright 2004-2006 by Kevin Smith
+// released under the MIT-style wxruby2 license
</ins><span class="cx">
</span><ins>+// These are standard Wx graphic/drawing objects.
Unlike RubyConstants,
+// objects in this file aren''t loaded into ruby until AFTER
app.on_init
+
+// Trying to create these kind of objects before a wxApp has started causes
+// errors on GTK.
</ins><span class="cx"> %module(directors="1")
wxRubyStockObjects
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> %include "common.i"
</span><span class="cx">
</span><span class="cx"> %{
</span><span class="lines">@@ -44,16 +50,6 @@
</span><span class="cx"> %constant wxColour* const
wxGREEN;
</span><span class="cx"> %constant wxColour* const
wxCYAN;
</span><span class="cx"> %constant wxColour* const
wxLIGHT_GREY;
</span><del>-
-#// ''Null'' objects
-%constant wxBitmap const NULL_BITMAP = wxNullBitmap;
-%constant wxIcon const NULL_ICON = wxNullIcon;
-%constant wxCursor const NULL_CURSOR = wxNullCursor;
-%constant wxPen const NULL_PEN = wxNullPen;
-%constant wxBrush const NULL_BRUSH = wxNullBrush;
-%constant wxPalette const NULL_PALETTE = wxNullPalette;
-%constant wxFont const NULL_FONT = wxNullFont;
-%constant wxColour const NULL_COLOUR = wxNullColour;
</del><span class="cx">
</span><span class="cx"> %constant wxCursor const*
wxSTANDARD_CURSOR;
</span><span class="cx"> %constant wxCursor const*
wxHOURGLASS_CURSOR;
</span></span></pre>
</div>
</div>
</body>
</html>
Seemingly Similar Threads
- [843] trunk/wxruby2: Moved stock colours so they are available from library load time
- [883] branches/wxruby2/wxwidgets_282/swig: API changes for move to WxWidgets 2.8
- [990] branches/wxruby2/wxwidgets_282/samples/bigdemo/wxCursor.rbw: Use paint block instead of ClientDC; load icon file safely
- [923] branches/wxruby2/wxwidgets_282: Changes 2.6 -> 2.8 Wx API; remove unsupported methods and examples from doc
- [826] trunk/wxruby2/swig: Move RubyStockObjects back to App.i to avoid lots of error msg on GTK
Wisdom of the Ancients
