nobody at rubyforge.org
2007-Apr-29 00:12 UTC
[Wxruby-development] [981] branches/wxruby2/wxwidgets_282/samples/caret/caret.rb: Don''t call PaintDC.new; just refresh() instead of duplicating paint code
<!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>[981] branches/wxruby2/wxwidgets_282/samples/caret/caret.rb: Don''t call PaintDC.new; just refresh() instead of duplicating paint code</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>981</dd> <dt>Author</dt> <dd>brokentoy</dd> <dt>Date</dt> <dd>2007-04-28 20:12:32 -0400 (Sat, 28 Apr 2007)</dd> </dl> <h3>Log Message</h3> <pre>Don''t call PaintDC.new; just refresh() instead of duplicating paint code</pre> <h3>Modified Paths</h3> <ul> <li><a href="#brancheswxruby2wxwidgets_282samplescaretcaretrb">branches/wxruby2/wxwidgets_282/samples/caret/caret.rb</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="brancheswxruby2wxwidgets_282samplescaretcaretrb"></a> <div class="modfile"><h4>Modified: branches/wxruby2/wxwidgets_282/samples/caret/caret.rb (980 => 981)</h4> <pre class="diff"><span> <span class="info">--- branches/wxruby2/wxwidgets_282/samples/caret/caret.rb        2007-04-29 00:02:02 UTC (rev 980) +++ branches/wxruby2/wxwidgets_282/samples/caret/caret.rb        2007-04-29 00:12:32 UTC (rev 981) </span><span class="lines">@@ -166,15 +166,14 @@ </span><span class="cx"> caret.hide </span><span class="cx"> end </span><span class="cx"> </span><del>- dc = PaintDC.new(self) - prepare_dc(dc) - dc.clear </del><ins>+ paint do | dc | + dc.clear + dc.set_font(@font) </ins><span class="cx"> </span><del>- dc.set_font(@font) - - for y in 0 ... @y_chars - line = @text[@x_chars * y,@x_chars] - dc.draw_text( line, @x_margin, @y_margin + y * @height_char ) </del><ins>+ for y in 0 ... @y_chars + line = @text[@x_chars * y,@x_chars] + dc.draw_text( line, @x_margin, @y_margin + y * @height_char ) + end </ins><span class="cx"> end </span><span class="cx"> </span><span class="cx"> if caret </span><span class="lines">@@ -204,21 +203,8 @@ </span><span class="cx"> ch = event.key_code </span><span class="cx"> if !event.alt_down and (ch >= K_SPACE) and (ch < K_DELETE) </span><span class="cx"> self[@x_caret, @y_caret] = ch.chr </span><del>- - caret = get_caret - if caret - caret.hide - end - - dc = ClientDC.new(self) - dc.set_font(@font) - dc.set_background_mode(SOLID) # overwrite old value - dc.draw_text(ch.chr, @x_margin + @x_caret * @width_char, - @y_margin + @y_caret * @height_char ) </del><ins>+ refresh </ins><span class="cx"> next_char </span><del>- if caret - caret.show - end </del><span class="cx"> else </span><span class="cx"> event.skip </span><span class="cx"> end </span></span></pre> </div> </div> </body> </html>
Reasonably Related Threads
- [999] branches/wxruby2/wxwidgets_282/samples/caret/caret.rb: Use paint() instead of ClientDC.new() in caret sample
- [979] branches/wxruby2/wxwidgets_282/lib/wx/classes/paintdc.rb: Prevent dangerous direct instantiation of PaintDC
- Problem with PaintDC(MSW)
- [980] branches/wxruby2/wxwidgets_282/samples/bigdemo/ShapedWindow.rbw: Use Window#paint instead of PaintDC.new
- [739] trunk/wxruby2/samples/dialogs/dialogs.rb: Changed back to using block version of paint in on_paint method.