thr3ads.net - wxruby development - [Wxruby-development] [826] trunk/wxruby2/swig: Move RubyStockObjects back to App.i to avoid lots of error msg on GTK [Jan 2007]

If this information is useful, please help other people find it:
Share via:

nobody at rubyforge.org

2007-Jan-05 21:11 UTC

[Wxruby-development] [826] trunk/wxruby2/swig: Move RubyStockObjects back to App.i to avoid lots of error msg on GTK

<!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>[826] trunk/wxruby2/swig: Move RubyStockObjects back to App.i to
avoid lots of error msg on GTK</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>826</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-01-05 16:11:50 -0500 (Fri, 05 Jan
2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move RubyStockObjects back to App.i to avoid lots of error msg on
GTK</pre>

<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2swigclassesAppi">trunk/wxruby2/swig/classes/App.i</a></li>
<li><a
href="#trunkwxruby2swigwxi">trunk/wxruby2/swig/wx.i</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2swigclassesAppi"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/classes/App.i (825 => 826)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/classes/App.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-01-04
22:48:52 UTC (rev 825)
+++
trunk/wxruby2/swig/classes/App.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-01-05
21:11:50 UTC (rev 826)
</span><span class="lines">@@ -26,7 +26,9 @@
</span><span class="cx"> %{
</span><span class="cx"> 
</span><span class="cx"> extern swig_class cWxEvtHandler;
</span><ins>+extern "C" void Init_wxRubyStockObjects();
</ins><span class="cx"> 
</span><ins>+
</ins><span class="cx"> class wxRubyApp : public wxApp
</span><span class="cx"> {
</span><span class="cx">     
</span><span class="lines">@@ -82,11 +84,17 @@
</span><span class="cx"> #ifdef
__WXDEBUG__&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
</span><span class="cx">         printf("OnInitGui
after\n");
</span><span class="cx">
#endif&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
</span><ins>+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp//
Stock objects must not be instantiated before a wxApp has started
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif
( result )
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
Init_wxRubyStockObjects();
+
</ins><span class="cx">         return result;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     virtual int OnExit()
</span><span class="cx">     {
</span><ins>+
+
</ins><span class="cx"> #ifdef __WXDEBUG__    
</span><span class="cx">        
printf("OnExit...\n");
</span><span class="cx">
#endif&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
</span></span></pre></div>
<a id="trunkwxruby2swigwxi"></a>
<div class="modfile"><h4>Modified: trunk/wxruby2/swig/wx.i
(825 => 826)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/wx.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-01-04
22:48:52 UTC (rev 825)
+++
trunk/wxruby2/swig/wx.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-01-05
21:11:50 UTC (rev 826)
</span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx">
///////////////////////////////////////////////////
</span><del>-extern "C" void Init_wxRubyStockObjects();
</del><span class="cx"> extern "C" void
Init_wxRubyEventTypes();
</span><span class="cx"> 
</span><span class="cx"> %} 
</span><span class="lines">@@ -69,14 +68,10 @@
</span><span class="cx"> 
</span><span class="cx">     extern void
InitializeOtherModules();
</span><span class="cx">     InitializeOtherModules();
</span><del>-    wxInitializeStockLists();
-    wxInitializeStockObjects();
</del><span class="cx">     wxInitAllImageHandlers();
</span><span class="cx"> 
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp// Load
the event type constants
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspInit_wxRubyEventTypes();
</span><del>-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp//
Load the stock colours (eg Wx::RED), pens and brushes
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspInit_wxRubyStockObjects();
</del><span class="cx"> 
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp// This
is needed so HtmlHelp can load docs from a zip file
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspwxFileSystem::AddHandler(new
wxZipFSHandler);
</span></span></pre>
</div>
</div>

</body>
</html>

Possibly Parallel Threads

Search for more possibly parallel threads

wxruby development - Jan 2007 - [826] trunk/wxruby2/swig: Move RubyStockObjects back to App.i to avoid lots of error msg on GTK

[Wxruby-development] [826] trunk/wxruby2/swig: Move RubyStockObjects back to App.i to avoid lots of error msg on GTK

Possibly Parallel Threads

Wisdom of the Ancients