nobody at rubyforge.org
2007-Jan-03 21:01 UTC
[Wxruby-development] [824] trunk/wxruby2/swig/classes/App.i: Remove some ifdefs for old unstable versions of WxWidgets
<!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>[824] trunk/wxruby2/swig/classes/App.i: Remove some ifdefs for old
unstable versions of WxWidgets</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>824</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-01-03 16:01:05 -0500 (Wed, 03 Jan
2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove some ifdefs for old unstable versions of WxWidgets</pre>
<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2swigclassesAppi">trunk/wxruby2/swig/classes/App.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 (823 => 824)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/classes/App.i        2007-01-03
01:38:59 UTC (rev 823)
+++
trunk/wxruby2/swig/classes/App.i        2007-01-03
21:01:05 UTC (rev 824)
</span><span class="lines">@@ -50,23 +50,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifdef __WXMSW__
</span><del>-        #if
wxMINOR_VERSION == 4
-                                extern
int wxEntry(WXHINSTANCE hInstance,
-                                WXHINSTANCE
WXUNUSED(hPrevInstance),
-                                char
*lpCmdLine,
-                                int
nCmdShow,
-                                bool
enterLoop);
-                        wxEntry(GetModuleHandle(NULL),0,"",true,true);
-        #else
-                                extern
int wxEntry(HINSTANCE hInstance,
-                                                        HINSTANCE
WXUNUSED(hPrevInstance),
-                                                        wxCmdLineArgType
WXUNUSED(pCmdLine),
-                                                        int
nCmdShow);
-                        wxEntry(GetModuleHandle(NULL),(HINSTANCE)0,(wxCmdLineArgType)"",(int)true);
-        #endif
</del><ins>+                extern
int wxEntry(HINSTANCE hInstance,
+                                                
HINSTANCE WXUNUSED(hPrevInstance),
+                                                
wxCmdLineArgType WXUNUSED(pCmdLine),
+                                                
int nCmdShow);
+                wxEntry(GetModuleHandle(NULL),(HINSTANCE)0,(wxCmdLineArgType)"",(int)true);
</ins><span class="cx"> #elif __WXMAC__
</span><del>-        wxEntry(argc,(char
**)argv);
-        
</del><ins>+                wxEntry(argc,(char
**)argv);
</ins><span class="cx"> #else
</span><span class="cx">
                wxEntry(argc,
argv);
</span><span class="cx"> #endif
</span><span class="lines">@@ -105,9 +95,6 @@
</span><span class="cx"> printf("survived
gc\n");
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !wxCHECK_VERSION(2,5,0)
- wxTheApp = 0;
-#endif
</del><span class="cx"> wxLog *oldlog =
wxLog::SetActiveTarget(new wxLogStderr);
</span><span class="cx"> SetTopWindow(0);
</span><span class="cx"> if ( oldlog )
</span><span class="lines">@@ -185,7 +172,3 @@
</span><span class="cx"> int main_loop();
</span><span class="cx">
                
</span><span class="cx"> };
</span><del>-
-%extend wxRubyApp {
-
-}
</del></span></pre>
</div>
</div>
</body>
</html>
Reasonably Related Threads
- Memory leaks
- Page fault with MFC42.DLL
- [1022] trunk/wxruby2/swig/classes/App.i: Memory mgmt: use Wx::App to mark still-alive Windows, set up Wx::THE_APP const
- [1117] trunk/wxruby2/swig/classes/App.i: No director for GetTopWindow, remove Unlink in OnExit to avoid exception
- [1136] trunk/wxruby2/swig/classes/App.i: Note when the Wx::App is exiting and avoid doing GC if in process of
Wisdom of the Ancients
