--- AE/Installer/trunk/source/aeinstallerapp.cpp 2009/06/18 22:30:46 356 +++ AE/Installer/trunk/source/aeinstallerapp.cpp 2009/06/29 19:23:42 379 @@ -8,7 +8,9 @@ // Copyright: // Licence: ///////////////////////////////////////////////////////////////////////////// - +#include "boost/thread.hpp" +#include +#include #include "boost/filesystem.hpp" // includes all needed Boost.Filesystem declarations #include "boost/lexical_cast.hpp" //int -> string using namespace boost::filesystem; @@ -108,6 +110,16 @@ bool AEInstallerApp::OnInit() ////@end AEInstallerApp initialisation TheWindow = mainWindow; +#ifndef WIN32 + // CIP: test for the third-party mono framework, because without it, on Mac, we are up a creek + + + if (!monoPresent) // abort! abort! abort! + { + // CIP: disable window controls, present alert with URL to download mono, alert window has one button, "Quit" + } +#endif + //anything after this is done after the window appears... if ( !exists("../GameDataFolder") ) { wxMessageDialog* YesNoDialog = new wxMessageDialog(TheWindow, "You haven't globalized yet! \nYou must globalize to use the Anniversary Edition framework. \nWould you like to globalize now? (This could take a while...)\n(Selecting \"No\" will exit this program...)", "AE Installer Alert", wxYES_NO | wxICON_EXCLAMATION , wxDefaultPosition); @@ -116,7 +128,22 @@ bool AEInstallerApp::OnInit() TheWindow->Close(); } else { - //globalize... + TheWindow->InstallButton->Disable(); + TheWindow->ReglobalizeButton->Disable(); + +#ifdef WIN32 + + boost::thread thrd3(globalizeData); + //globalizeData(); + //boost::thread::create_thread(&globalizeData); + // boost::thread_group Tg; + // Tg.create_thread( &globalizeData(), this ); +#else + globalizeData(); +#endif + + TheWindow->InstallButton->Enable(); + TheWindow->ReglobalizeButton->Enable(); } }