nobody at rubyforge.org
2006-Nov-13 07:00 UTC
[Wxruby-development] [732] trunk/wxruby2/samples: Fixed a few crashes related to the about box menu.
<!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>[732] trunk/wxruby2/samples: Fixed a few crashes related to the about box menu.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>732</dd> <dt>Author</dt> <dd>seanlong</dd> <dt>Date</dt> <dd>2006-11-13 02:00:35 -0500 (Mon, 13 Nov 2006)</dd> </dl> <h3>Log Message</h3> <pre>Fixed a few crashes related to the about box menu.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#trunkwxruby2samplesbigdemobigdemorb">trunk/wxruby2/samples/bigdemo/bigdemo.rb</a></li> <li><a href="#trunkwxruby2samplescontrolscontrolsrb">trunk/wxruby2/samples/controls/controls.rb</a></li> <li><a href="#trunkwxruby2samplesetcwizardrb">trunk/wxruby2/samples/etc/wizard.rb</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="trunkwxruby2samplesbigdemobigdemorb"></a> <div class="modfile"><h4>Modified: trunk/wxruby2/samples/bigdemo/bigdemo.rb (731 => 732)</h4> <pre class="diff"><span> <span class="info">--- trunk/wxruby2/samples/bigdemo/bigdemo.rb        2006-11-13 06:35:38 UTC (rev 731) +++ trunk/wxruby2/samples/bigdemo/bigdemo.rb        2006-11-13 07:00:35 UTC (rev 732) </span><span class="lines">@@ -326,6 +326,7 @@ </span><span class="cx"> @nb.add_page(@ovr, "Overview") </span><span class="cx"> </span><span class="cx"> if Wx.const_defined?(:Scintilla) </span><ins>+puts "here" </ins><span class="cx"> panel, @txt = setup_editor(@nb) </span><span class="cx"> @nb.add_page(panel, "Demo Code") </span><span class="cx"> else </span></span></pre></div> <a id="trunkwxruby2samplescontrolscontrolsrb"></a> <div class="modfile"><h4>Modified: trunk/wxruby2/samples/controls/controls.rb (731 => 732)</h4> <pre class="diff"><span> <span class="info">--- trunk/wxruby2/samples/controls/controls.rb        2006-11-13 06:35:38 UTC (rev 731) +++ trunk/wxruby2/samples/controls/controls.rb        2006-11-13 07:00:35 UTC (rev 732) </span><span class="lines">@@ -14,9 +14,9 @@ </span><span class="cx"> end </span><span class="cx"> include Wx </span><span class="cx"> </span><del>-CONTROLS_QUIT = 100 </del><ins>+CONTROLS_QUIT = ID_EXIT </ins><span class="cx"> CONTROLS_TEXT = 101 </span><del>-CONTROLS_ABOUT = 102 </del><ins>+CONTROLS_ABOUT = ID_ABOUT </ins><span class="cx"> CONTROLS_CLEAR_LOG = 103 </span><span class="cx"> # tooltip menu </span><span class="cx"> CONTROLS_SET_TOOLTIP_DELAY = 200 </span></span></pre></div> <a id="trunkwxruby2samplesetcwizardrb"></a> <div class="modfile"><h4>Modified: trunk/wxruby2/samples/etc/wizard.rb (731 => 732)</h4> <pre class="diff"><span> <span class="info">--- trunk/wxruby2/samples/etc/wizard.rb        2006-11-13 06:35:38 UTC (rev 731) +++ trunk/wxruby2/samples/etc/wizard.rb        2006-11-13 07:00:35 UTC (rev 732) </span><span class="lines">@@ -32,8 +32,8 @@ </span><span class="cx"> s = Wx::StaticText.new(self, -1, ''The Wizard has completed'') </span><span class="cx"> </span><span class="cx"> </span><del>- evt_menu(Wx::ID_EXIT) { onQuit } - evt_menu(Wx::ID_ABOUT) { onAbout } </del><ins>+ evt_menu(Wx::ID_EXIT) { on_quit } + evt_menu(Wx::ID_ABOUT) { on_about } </ins><span class="cx"> w = Wx::Wizard.new(self, -1, ''The WxRuby Wizard'') </span><span class="cx"> p1 = Wx::WizardPageSimple.new(w) </span><span class="cx"> s = Wx::StaticText.new(p1, -1, ''This is the first page'') </span><span class="lines">@@ -54,14 +54,14 @@ </span><span class="cx"> w.run_wizard(p1) </span><span class="cx"> end </span><span class="cx"> </span><del>- def onQuit </del><ins>+ def on_quit </ins><span class="cx"> close(Wx::TRUE) </span><span class="cx"> end </span><span class="cx"> </span><del>- def onAbout </del><ins>+ def on_about </ins><span class="cx"> msg = sprintf("This is the About dialog of the wizard sample.\n" \ </span><span class="cx"> "Welcome to %s", Wx::VERSION_STRING) </span><del>- message_box(msg, "About Wizard", Wx::OK|Wx::ICON_INFORMATION, self) </del><ins>+ Wx::message_box(msg, "About Wizard", Wx::OK|Wx::ICON_INFORMATION, self) </ins><span class="cx"> end </span><span class="cx"> end </span><span class="cx"> </span></span></pre> </div> </div> </body> </html>
Reasonably Related Threads
- [731] trunk/wxruby2/samples/etc/sash.rb: Changed menu events so they call the correct method.
- Issues adding sub-menu items
- [729] trunk/wxruby2/samples/bigdemo/bigdemo.rb: Fix some little bugs with the About dialog
- pictorG
- [778] trunk/wxruby2: Remove broken and deprecated LayoutConstraints, update samples & docs