nobody at rubyforge.org
2007-Mar-31 15:26 UTC
[Wxruby-development] [934] branches/wxruby2/wxwidgets_282: Rename OnAssert to OnAssertFailure, reflecting wx 2.8 API
<!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>[934] branches/wxruby2/wxwidgets_282: Rename OnAssert to
OnAssertFailure, reflecting wx 2.8 API</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>934</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-03-31 11:26:51 -0400 (Sat, 31 Mar
2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename OnAssert to OnAssertFailure, reflecting wx 2.8 API</pre>
<h3>Modified Paths</h3>
<ul>
<li><a
href="#brancheswxruby2wxwidgets_282doctextileapptxtl">branches/wxruby2/wxwidgets_282/doc/textile/app.txtl</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282libwxclassesapprb">branches/wxruby2/wxwidgets_282/lib/wx/classes/app.rb</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesAppi">branches/wxruby2/wxwidgets_282/swig/classes/App.i</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="brancheswxruby2wxwidgets_282doctextileapptxtl"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/doc/textile/app.txtl (933 => 934)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/doc/textile/app.txtl        2007-03-30
07:59:37 UTC (rev 933)
+++
branches/wxruby2/wxwidgets_282/doc/textile/app.txtl        2007-03-31
15:26:51 UTC (rev 934)
</span><span class="lines">@@ -257,28 +257,23 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-h3(#App_onassert). App#on_assert
</del><ins>+h3(#App_onassert). App#on_assert_failure
</ins><span class="cx">
</span><del>- *on_assert*(%(arg-type)Char% file,
%(arg-type)Integer% line, %(arg-type)Char% cond,
</del><ins>+ *on_assert_failure*(%(arg-type)Char% file,
%(arg-type)Integer% line, %(arg-type)Char% cond,
</ins><span class="cx"> %(arg-type)Char% msg)
</span><span class="cx">
</span><del>-This function is called when an assert failure occurs,
i.e. the condition
-specified in "ASSERT":assert.html macro evaluated to @false@.
-It is only called in debug mode (when @__WXDEBUG__@ is defined) as
-asserts are not left in the release code at all.
</del><ins>+This method is called when an assert failure occurs,
i.e. a condition
+specified in the WxWidgets C++ library evaluates to @false@. It is only
+called if WxWidgets was compiled in debug mode (when @__WXDEBUG__@ is
+defined); note that standard releases of WxRuby are compiled without
+this option.
</ins><span class="cx">
</span><del>-The base class version show the default assert failure
dialog box proposing to
-the user to stop the program, continue or ignore all subsequent asserts.
-
</del><span class="cx"> h4. Parameters
</span><span class="cx">
</span><span class="cx"> * _file_ the name of the source
file where the assert occurred
</span><span class="cx"> * _line_ the line number in this
file where the assert occurred
</span><span class="cx"> * _cond_ the condition of the
failed assert in string form
</span><del>-* _msg_ the message specified as argument to
-"ASSERT_MSG":assertmsg.html or "FAIL_MSG":failmsg.html,
will
-be @NULL@ if just "ASSERT":assert.html or "FAIL":fail.html
-was used
</del><ins>+* _msg_ the failure message, may be @nil@ if just
"ASSERT":assert.html or "FAIL":fail.html was used
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> h3(#App_oncmdlineerror).
App#on_cmd_line_error
</span></span></pre></div>
<a id="brancheswxruby2wxwidgets_282libwxclassesapprb"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/lib/wx/classes/app.rb (933 => 934)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/lib/wx/classes/app.rb        2007-03-30
07:59:37 UTC (rev 933)
+++
branches/wxruby2/wxwidgets_282/lib/wx/classes/app.rb        2007-03-31
15:26:51 UTC (rev 934)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> # WxRuby. Such messages usually
indicate that the API is being used
</span><span class="cx"> # incorrectly; the file/line
reference points to the place in the
</span><span class="cx"> # WxWidgets source code where
the assertion was made.
</span><del>- def on_assert(file, line, condition, message)
</del><ins>+ def on_assert_failure(file, line, condition, message)
</ins><span class="cx"> warn "Wx WARNING:
#{message} (#{file}:#{line})"
</span><span class="cx"> end
</span><span class="cx"> end
</span></span></pre></div>
<a id="brancheswxruby2wxwidgets_282swigclassesAppi"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/App.i (933 => 934)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/App.i        2007-03-30
07:59:37 UTC (rev 933)
+++
branches/wxruby2/wxwidgets_282/swig/classes/App.i        2007-03-31
15:26:51 UTC (rev 934)
</span><span class="lines">@@ -118,7 +118,8 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
        
</span><del>-        virtual
void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar
*msg)
</del><ins>+ // actually implemented in ruby in classes/app.rb
+        virtual
void OnAssertFailure(const wxChar *file, int line, const wxChar *cond, const
wxChar *msg)
</ins><span class="cx">
        {
</span><span class="cx">
                printf("ASSERT
fired\n");
</span><span class="cx">
        }
</span><span class="lines">@@ -145,7 +146,7 @@
</span><span class="cx"> wxString GetVendorName() const;
</span><span class="cx"> void ExitMainLoop() ;
</span><span class="cx"> int MainLoop() ;
</span><del>- virtual void OnAssert(const wxChar *file, int line,
const wxChar *cond, const wxChar *msg);
</del><ins>+ virtual void OnAssertFailure(const wxChar *file, int
line, const wxChar *cond, const wxChar *msg);
</ins><span class="cx"> virtual int OnExit() ;
</span><span class="cx"> virtual bool
OnCmdLineError(wxCmdLineParser& parser ) ;
</span><span class="cx"> virtual bool
OnCmdLineHelp(wxCmdLineParser& parser ) ;
</span></span></pre>
</div>
</div>
</body>
</html>
Possibly Parallel Threads
- [898] branches/wxruby2/wxwidgets_282/swig/classes/App.i: Fix init of stock objects for Wx2.8 - was causing infinite loop +crash on OS X
- [1092] trunk/wxruby2/swig/classes/App.i: Pass correctly typed Events into filter_event, if defined (bug 10797);
- [LLVMdev] Introducing LLBrowse: A graphical browser for LLVM modules
- [LLVMdev] Introducing LLBrowse: A graphical browser for LLVM modules
- [LLVMdev] Introducing LLBrowse: A graphical browser for LLVM modules
