nobody at rubyforge.org
2007-Apr-28 23:54 UTC
[Wxruby-development] [978] branches/wxruby2/wxwidgets_282/samples/bigdemo/wxScrolledWindow.rbw: Fix crazy crashers on MSW; fix scrolling/drawing position; safe path to bitmap
<!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>[978]
branches/wxruby2/wxwidgets_282/samples/bigdemo/wxScrolledWindow.rbw: Fix crazy
crashers on MSW; fix scrolling/drawing position; safe path to
bitmap</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>978</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-04-28 19:54:46 -0400 (Sat, 28 Apr
2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix crazy crashers on MSW; fix scrolling/drawing position; safe path
to bitmap</pre>
<h3>Modified Paths</h3>
<ul>
<li><a
href="#brancheswxruby2wxwidgets_282samplesbigdemowxScrolledWindowrbw">branches/wxruby2/wxwidgets_282/samples/bigdemo/wxScrolledWindow.rbw</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a
id="brancheswxruby2wxwidgets_282samplesbigdemowxScrolledWindowrbw"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/samples/bigdemo/wxScrolledWindow.rbw (977 =>
978)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/samples/bigdemo/wxScrolledWindow.rbw        2007-04-28
23:31:48 UTC (rev 977)
+++
branches/wxruby2/wxwidgets_282/samples/bigdemo/wxScrolledWindow.rbw        2007-04-28
23:54:46 UTC (rev 978)
</span><span class="lines">@@ -26,7 +26,8 @@
</span><span class="cx">
set_background_colour(Wx::WHITE)
</span><span class="cx">
</span><span class="cx">
set_cursor(Wx::Cursor.new(Wx::CURSOR_PENCIL))
</span><del>- @bmp =
Wx::Bitmap.new("./icons/test2.xpm")
</del><ins>+ bmp_file = File.join(File.dirname(__FILE__),
''icons'', ''test2.xpm'')
+ @bmp = Wx::Bitmap.new(bmp_file)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> set_scrollbars(20, 20,
@maxWidth / 20, @maxHeight / 20, 0, 0, true)
</span><span class="lines">@@ -39,15 +40,13 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def on_paint(event)
</span><del>- dc = Wx::PaintDC.new(self)
- prepare_dc(dc)
- # since we''re not buffering in this case, we have to
- # paint the whole window, potentially very time consuming.
- do_drawing(dc)
</del><ins>+ paint { | dc | do_drawing(dc) }
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def do_drawing(dc,
printing=false)
</span><del>- dc.set_pen(Wx::Pen.new("RED", 1,
Wx::SOLID)) # Pen constructor requires (color, width, style)
</del><ins>+ # Reset the origin co-ordinates of the DC to
reflect current scrolling
+ do_prepare_dc(dc)
+ dc.set_pen(Wx::Pen.new("RED", 1, Wx::SOLID))
</ins><span class="cx">
dc.draw_rectangle(5,5,50,50)
</span><span class="cx">
</span><span class="cx">
dc.set_brush(Wx::LIGHT_GREY_BRUSH)
</span><span class="lines">@@ -161,11 +160,9 @@
</span><span class="cx"> # If doing
buffered drawing, create the buffered DC, giving it
</span><span class="cx"> # it a real DC to
blit to when done.
</span><span class="cx"> cdc =
Wx::ClientDC.new(self)
</span><del>- prepare_dc(cdc)
</del><span class="cx"> dc =
Wx::BufferedDC.new(cdc, @buffer)
</span><span class="cx"> else
</span><span class="cx"> dc =
Wx::ClientDC.new(self)
</span><del>- prepare_dc(dc)
</del><span class="cx"> end
</span><span class="cx">
dc.set_pen(Wx::Pen.new("MEDIUM FOREST GREEN", 4, Wx::SOLID))
</span><span class="cx"> coords = [@x, @y] +
convert_event_coords(event)
</span></span></pre>
</div>
</div>
</body>
</html>
Possibly Parallel Threads
- [976] branches/wxruby2/wxwidgets_282/samples/bigdemo/wxScrolledWindow.rbw: Remove deprecated begin_drawing and end_drawing calls
- [993] branches/wxruby2/wxwidgets_282/samples/bigdemo/wxScrolledWindow.rbw: Use ClientDC via Window#paint object
- [ wxruby-Patches-14375 ] bigdemo/wxScrolledWindow - paint bug with scrolled window
- [990] branches/wxruby2/wxwidgets_282/samples/bigdemo/wxCursor.rbw: Use paint block instead of ClientDC; load icon file safely
- Patch to wxScrolledWindow.rbw
Wisdom of the Ancients
