nobody at rubyforge.org
2006-Oct-23 00:08 UTC
[Wxruby-development] [709] trunk/wxruby2/samples/dialogs/dialogs.rb: Use paint method again, remove unnecessary global (Alex Fenton)
<!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>[709] trunk/wxruby2/samples/dialogs/dialogs.rb: Use paint method
again, remove unnecessary global (Alex Fenton)</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>709</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2006-10-22 20:08:01 -0400 (Sun, 22 Oct
2006)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use paint method again, remove unnecessary global (Alex
Fenton)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2samplesdialogsdialogsrb">trunk/wxruby2/samples/dialogs/dialogs.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2samplesdialogsdialogsrb"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/samples/dialogs/dialogs.rb (708 => 709)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/samples/dialogs/dialogs.rb        2006-10-22
01:02:54 UTC (rev 708)
+++
trunk/wxruby2/samples/dialogs/dialogs.rb        2006-10-23
00:08:01 UTC (rev 709)
</span><span class="lines">@@ -130,21 +130,15 @@
</span><span class="cx"> class MyCanvas <
ScrolledWindow
</span><span class="cx"> def initialize(parent)
</span><span class="cx">
super(parent,-1,DEFAULT_POSITION,DEFAULT_SIZE, NO_FULL_REPAINT_ON_RESIZE)
</span><del>- text = Wx::StaticText.new(self, -1,
- ''WxRuby common dialog test
application'',
- Wx::Point.new(10, 10) )
- # PaintDC currently causing ObjectPreviouslyDeleted (10 Aug 2006)
- # evt_paint() {|event| onPaint(event) }
</del><ins>+ evt_paint { |event| on_paint(event) }
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def clear
</span><span class="cx">
</span><span class="cx"> end
</span><span class="cx">
</span><del>- def onPaint(event)
- # PaintDC currently causing ObjectPreviouslyDeleted (10 Aug 2006)
</del><ins>+ def on_paint(event)
</ins><span class="cx"> paint do | dc |
</span><del>- p dc
</del><span class="cx"> dc.set_text_foreground(
get_app.canvas_text_colour )
</span><span class="cx"> dc.set_font(
get_app.canvas_font )
</span><span class="cx"> dc.draw_text("Windows
common dialogs test application", 10, 10)
</span><span class="lines">@@ -229,15 +223,15 @@
</span><span class="cx">
</span><span class="cx"> def onChooseFont(event)
</span><span class="cx"> data = FontData.new
</span><del>- data.set_initial_font($app.canvas_font)
- data.set_colour($app.canvas_text_colour)
</del><ins>+ data.set_initial_font(Wx::get_app.canvas_font)
+ data.set_colour(Wx::get_app.canvas_text_colour)
</ins><span class="cx">
</span><span class="cx"> dialog = FontDialog.new(self,
data)
</span><span class="cx">
</span><span class="cx"> if dialog.show_modal() ==
ID_OK
</span><span class="cx"> retData =
dialog.get_font_data()
</span><del>- # $app.canvas_font = retData.get_chosen_font()
- # $app.canvas_text_colour = retData.get_colour()
</del><ins>+ Wx::get_app.canvas_font =
retData.get_chosen_font()
+ Wx::get_app.canvas_text_colour = retData.get_colour()
</ins><span class="cx"> font =
retData.get_chosen_font
</span><span class="cx"> msg = "Font = %s, %i
pt" % [ font.get_face_name,
</span><span class="cx">
font.get_point_size ]
</span><span class="lines">@@ -573,7 +567,7 @@
</span><span class="cx"> info =
BusyInfo.busy("Working, please wait...", self) do
</span><span class="cx">
</span><span class="cx"> for i in 0 ... 18
</span><del>- $app.yield()
</del><ins>+ Wx::get_app.yield()
</ins><span class="cx"> end
</span><span class="cx"> sleep(2)
</span><span class="cx"> end
</span><span class="lines">@@ -725,6 +719,6 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><del>-$app = MyApp.new()
-$app.main_loop()
</del><ins>+app = MyApp.new()
+app.main_loop()
</ins><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>
Reasonably Related Threads
- [736] trunk/wxruby2/samples/dialogs/dialogs.rb: Fixed crashing bug in on_paint and made the code style more Ruby like.
- [739] trunk/wxruby2/samples/dialogs/dialogs.rb: Changed back to using block version of paint in on_paint method.
- Window#paint patch
- [707] trunk/wxruby2/swig/classes/Window.i: Window-paint method now implemented in Ruby (Alex Fenton)
- [680] trunk/wxruby2/samples/printing/printing.rb: Cleaned up to use the Ruby naming convention, added #! line, now uses Wx default ID''s in standard menu items.
