|
From: <pst...@us...> - 2013-01-06 22:40:44
|
Revision: 941
http://sourceforge.net/p/jazzplusplus/code/941
Author: pstieber
Date: 2013-01-06 22:40:42 +0000 (Sun, 06 Jan 2013)
Log Message:
-----------
1. Commented out floating-point exception signals for Linux due to an exception
being thrown by the scrollbar code in the Ubuntu 12.04 Unity
liboveralay-scrollbar code.
2. Changed how wxApp::OnInit is called.
Modified Paths:
--------------
trunk/jazz/src/JazzPlusPlusApplication.cpp
Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.cpp 2013-01-06 03:13:16 UTC (rev 940)
+++ trunk/jazz/src/JazzPlusPlusApplication.cpp 2013-01-06 22:40:42 UTC (rev 941)
@@ -106,7 +106,10 @@
// 2. Invalid arguments (for example sqrt of a negative number).
// 3. Overflow.
// on a Linux box.
- feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
+
+ // The scrollbar code in the Ubuntu 12.04 Unity liboveralay-scrollbar code
+ // is causing floating point exceptions so I'm commenting out this code.
+// feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW);
#endif // __LINUX__
}
@@ -125,6 +128,12 @@
//-----------------------------------------------------------------------------
bool JZJazzPlusPlusApplication::OnInit()
{
+ // Call base class function. This is needed for command line parsing.
+ if (!wxApp::OnInit())
+ {
+ return false;
+ }
+
#if defined(_MSC_VER) && defined(_DEBUG)
RedirectIoToConsole();
#endif // _MSC_VER
@@ -140,9 +149,6 @@
mpProject = new JZProject;
gpProject = mpProject;
- // Call base class function. This is needed for command line parsing.
- wxApp::OnInit();
-
// Create the main application window.
mpTrackFrame = JZProjectManager::Instance()->CreateTrackView();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|