nobody at rubyforge.org
2007-Apr-26 22:45 UTC
[Wxruby-development] [973] branches/wxruby2/wxwidgets_282/swig/classes/Window.i: Fix crasher with Window#get_handle, also comment the paint method
<!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>[973] branches/wxruby2/wxwidgets_282/swig/classes/Window.i: Fix crasher with Window#get_handle, also comment the paint method</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>973</dd> <dt>Author</dt> <dd>brokentoy</dd> <dt>Date</dt> <dd>2007-04-26 18:45:33 -0400 (Thu, 26 Apr 2007)</dd> </dl> <h3>Log Message</h3> <pre>Fix crasher with Window#get_handle, also comment the paint method</pre> <h3>Modified Paths</h3> <ul> <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_282swigclassesWindowi"></a> <div class="modfile"><h4>Modified: branches/wxruby2/wxwidgets_282/swig/classes/Window.i (972 => 973)</h4> <pre class="diff"><span> <span class="info">--- branches/wxruby2/wxwidgets_282/swig/classes/Window.i        2007-04-26 22:20:47 UTC (rev 972) +++ branches/wxruby2/wxwidgets_282/swig/classes/Window.i        2007-04-26 22:45:33 UTC (rev 973) </span><span class="lines">@@ -17,6 +17,9 @@ </span><span class="cx"> %ignore wxWindow::GetAccessible; </span><span class="cx"> %ignore wxWindow::PopEventHandler; </span><span class="cx"> </span><ins>+// A custom method is required to do the correct casting - see below +%ignore wxWindow::GetHandle; + </ins><span class="cx"> // LayoutConstraints are deprecated and not supported in WxRuby </span><span class="cx"> %ignore wxWindow::SetConstraints; </span><span class="cx"> </span><span class="lines">@@ -143,6 +146,10 @@ </span><span class="cx"> </span><span class="cx"> return returnVal; </span><span class="cx"> } </span><ins>+ + // 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. </ins><span class="cx"> VALUE paint() </span><span class="cx"> { </span><span class="cx">         wxWindow *ptr = self; </span><span class="lines">@@ -156,4 +163,26 @@ </span><span class="cx">          } </span><span class="cx">         return Qnil; </span><span class="cx"> } </span><ins>+ + // Return a window handle as a platform-specific ruby integer + VALUE get_handle() + { +        wxWindow *win = self; +        long handle; + +        // borrowed from wxPython +#ifdef __WXMSW__ + handle = (long)win->GetHandle(); +#endif + +#if defined(__WXGTK__) || defined(__WXX11) + handle = (long)GetXWindow(win); +#endif + +#ifdef __WXMAC__ + handle = (long)win->GetHandle(); +#endif + +        return LONG2NUM(handle); + } </ins><span class="cx"> } </span></span></pre> </div> </div> </body> </html>
Apparently Analagous Threads
- [985] branches/wxruby2/wxwidgets_282/swig/classes/Window.i: Fix get_handle on GTK
- [910] branches/wxruby2/wxwidgets_282: Moved paint() method back into C++, so DC object is destroyed in timely
- [983] branches/wxruby2/wxwidgets_282: Make Window#paint work both inside and outside a paint event handler,
- [895] branches/wxruby2/wxwidgets_282/swig/classes: Fix Window::GetChildren method for changes in 2.6 -> 2.8 API
- [998] branches/wxruby2/wxwidgets_282/swig/classes/Window.i: Additional %ignore needed for Wx::Window in 2.8