thr3ads.net - wxruby development - [Wxruby-development] [834] trunk/wxruby2/lib/wx/classes/icon.rb: Simpler test for non-existent icon files [Jan 2007]

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

nobody at rubyforge.org

2007-Jan-06 00:04 UTC

[Wxruby-development] [834] trunk/wxruby2/lib/wx/classes/icon.rb: Simpler test for non-existent icon files

<!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>[834] trunk/wxruby2/lib/wx/classes/icon.rb: Simpler test for
non-existent icon files</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>834</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-01-05 19:04:46 -0500 (Fri, 05 Jan
2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Simpler test for non-existent icon files</pre>

<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2libwxclassesiconrb">trunk/wxruby2/lib/wx/classes/icon.rb</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2libwxclassesiconrb"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/lib/wx/classes/icon.rb (833 => 834)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/lib/wx/classes/icon.rb&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-01-06
00:02:24 UTC (rev 833)
+++
trunk/wxruby2/lib/wx/classes/icon.rb&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-01-06
00:04:46 UTC (rev 834)
</span><span class="lines">@@ -1,15 +1,14 @@
</span><span class="cx"> class Wx::Icon
</span><span class="cx">   # Redefine the initialize
method so it raises an exception if a
</span><del>-  # bad argument - in particular, a non-existent file -
is given to the
-  # constructor. It raisees an error if no data has been set to the icon.
</del><ins>+  # non-existent file is given to the constructor;
otherwise, wx Widgets
+  # just carries on with an empty icon, which may cause faults later
</ins><span class="cx">   wx_init =
self.instance_method(:initialize)
</span><span class="cx">   define_method(:initialize) do |
*args |
</span><del>-    wx_init.bind(self).call(*args)
-
-    # Zero-argument form allowed, for use with later copy_from_bitmap
-    if args.length.nonzero? and not ok
-      Kernel.raise ArgumentError, "Invalid icon specified:
#{args.inspect}"
</del><ins>+    if args[0].kind_of? String
+      if not File.exist?( File.expand_path(args[0]) )
+        Kernel.raise(ArgumentError, "Icon file does not exist:
#{args[0]}")
+      end
</ins><span class="cx">     end
</span><ins>+    wx_init.bind(self).call(*args)
</ins><span class="cx">   end
</span><del>-
</del><span class="cx"> end
</span></span></pre>
</div>
</div>

</body>
</html>

Maybe Matching Threads

Search for more maybe matching threads

wxruby development - Jan 2007 - [834] trunk/wxruby2/lib/wx/classes/icon.rb: Simpler test for non-existent icon files

[Wxruby-development] [834] trunk/wxruby2/lib/wx/classes/icon.rb: Simpler test for non-existent icon files

Maybe Matching Threads

Wisdom of the Ancients