thr3ads.net - wxruby development - [Wxruby-development] [983] branches/wxruby2/wxwidgets_282: Make Window#paint work both inside and outside a paint event handler, [Apr 2007]

If this information is useful, please help other people find it:
Share via:
nobody at rubyforge.org
2007-Apr-29 13:34 UTC
[Wxruby-development] [983] branches/wxruby2/wxwidgets_282: Make Window#paint work both inside and outside a paint event handler,

<!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>[983] branches/wxruby2/wxwidgets_282: Make Window#paint work both
inside and outside a paint event handler,</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>983</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-04-29 09:34:15 -0400 (Sun, 29 Apr
2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make Window#paint work both inside and outside a paint event handler,
supplying appropriate type of DC</pre>

<h3>Modified Paths</h3>
<ul>
<li><a
href="#brancheswxruby2wxwidgets_282libwxclasseswindowrb">branches/wxruby2/wxwidgets_282/lib/wx/classes/window.rb</a></li>
<li><a
href="#brancheswxruby2wxwidgets_282swigclassesWindowi">branches/wxruby2/wxwidgets_282/swig/classes/Window.i</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a
id="brancheswxruby2wxwidgets_282libwxclasseswindowrb"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/lib/wx/classes/window.rb (982 =>
983)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/lib/wx/classes/window.rb&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-04-29
08:57:06 UTC (rev 982)
+++
branches/wxruby2/wxwidgets_282/lib/wx/classes/window.rb&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-04-29
13:34:15 UTC (rev 983)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# Copyright 2004-2006 by Kevin Smith
</del><ins>+# Copyright 2004-2007 by Kevin Smith
</ins><span class="cx"> # released under the MIT-style
wxruby2 license
</span><span class="cx"> 
</span><span class="cx"> class Wx::Window
</span><span class="lines">@@ -21,4 +21,18 @@
</span><span class="cx">   def
find_window_by_label(a_label)
</span><span class="cx">    
Wx:Window.find_window_by_label(a_label, self)
</span><span class="cx">   end
</span><ins>+
+  alias :__old_evt_paint :evt_paint
+  # This modified version of evt_paint sets a variable indicating that a
+  # paint event is being handled just before running the event
+  # handler. This ensures that any call to Window#paint within the
+  # handler will supply a Wx::PaintDC (see swig/Window.i).
+  def evt_paint(&block)
+    wrapped_block = proc do
+      instance_variable_set("@__painting__", true)
+      block.call
+      remove_instance_variable("@__painting__")
+    end
+    __old_evt_paint(&wrapped_block)
+  end
</ins><span class="cx"> end
</span></span></pre></div>
<a
id="brancheswxruby2wxwidgets_282swigclassesWindowi"></a>
<div class="modfile"><h4>Modified:
branches/wxruby2/wxwidgets_282/swig/classes/Window.i (982 => 983)</h4>
<pre class="diff"><span>
<span class="info">---
branches/wxruby2/wxwidgets_282/swig/classes/Window.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-04-29
08:57:06 UTC (rev 982)
+++
branches/wxruby2/wxwidgets_282/swig/classes/Window.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-04-29
13:34:15 UTC (rev 983)
</span><span class="lines">@@ -112,6 +112,7 @@
</span><span class="cx"> %import
"include/wxDC.h"
</span><span class="cx"> %import
"include/wxWindowDC.h"
</span><span class="cx"> %import
"include/wxPaintDC.h"
</span><ins>+%import "include/wxClientDC.h"
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> %include
"include/wxWindow.h"
</span><span class="lines">@@ -147,13 +148,21 @@
</span><span class="cx">     return returnVal;    
</span><span class="cx">   }  
</span><span class="cx"> 
</span><del>-  // pass a PaintDC into a passed ruby block, and
ensure that the DC
-  // is correctly deleted when drawing is completed. This is important 
-  // to avoid entering an endless loop of paint events.
</del><ins>+  // passes a DC for drawing on Window into a passed
ruby block, and
+  // ensure that the DC is correctly deleted when drawing is
+  // completed. This is important to avoid entering an endless loop of
+  // paint events. The DC will be a PaintDC if used within a evt_paint handler
+  // (recommended) or else a ClientDC.
</ins><span class="cx">   VALUE paint()
</span><span class="cx">   {  
</span><ins>+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif
( ! rb_block_given_p() )
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp 
rb_raise(rb_eArgError, "No block given for Window#paint");
+
</ins><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspwxWindow
*ptr = self;
</span><del>-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif
( rb_block_given_p() )
</del><ins>+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspVALUE
rb_win = SWIG_RubyInstanceFor(ptr);
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp// see
if within an evt_paint block - see classes/window.rb
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp// if
so, supply a PaintDC to the block
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif (
rb_ivar_get(rb_win, rb_intern("@__painting__") ) == Qtrue )
</ins><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp  {
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspwxPaintDC
dc(ptr);
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspVALUE
dcVal = SWIG_NewPointerObj((void *) &dc,SWIGTYPE_p_wxPaintDC, 0);
</span><span class="lines">@@ -161,6 +170,15 @@
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspSWIG_RubyRemoveTracking((void
*) &dc);
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspDATA_PTR(dcVal)
= NULL;
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp  }
</span><ins>+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspelse
// supply a ClientDC
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp  {
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspwxClientDC
dc(ptr);
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspVALUE
dcVal = SWIG_NewPointerObj((void *) &dc,SWIGTYPE_p_wxClientDC, 0);
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsprb_yield(dcVal);
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspSWIG_RubyRemoveTracking((void
*) &dc);
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspDATA_PTR(dcVal)
= NULL;
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp  }
+
</ins><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspreturn
Qnil;
</span><span class="cx">   }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>
Seemingly Similar Threads

Search for more reasonably related threads
wxruby development - Apr 2007 - [983] branches/wxruby2/wxwidgets_282: Make Window#paint work both inside and outside a paint event handler,

[Wxruby-development] [983] branches/wxruby2/wxwidgets_282: Make Window#paint work both inside and outside a paint event handler,

Seemingly Similar Threads

Wisdom of the Ancients
