mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-24 01:54:22 +00:00
Code Activity

Fixed a mac initialisation problem.

Browse source
This commit is contained in:
Julian Storer 2010-07-12 21:18:14 +01:00
parent 26475b1b77
commit c20daf9740
21 changed files with 165 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/application/juce_Application.cpp
View file

@ -36,13 +36,16 @@ BEGIN_JUCE_NAMESPACE
#include "../core/juce_PlatformUtilities.h"
#include "../text/juce_LocalisedStrings.h"
#if JUCE_MAC
extern void juce_initialiseMacMainMenu();
#endif
//==============================================================================
JUCEApplication::JUCEApplication()
: appReturnValue (0),
stillInitialising (true)
{
jassert (appInstance == 0);
jassert (isStandaloneApp && appInstance == 0);
appInstance = this;
}
@ -58,24 +61,10 @@ JUCEApplication::~JUCEApplication()
appInstance = 0;
}
bool JUCEApplication::isStandaloneApp = false;
JUCEApplication* JUCEApplication::appInstance = 0;
JUCEApplication* JUCEApplication::getInstance() throw()
{
return appInstance;
}
bool JUCEApplication::isInitialising() const throw()
{
return stillInitialising;
}
//==============================================================================
const String JUCEApplication::getApplicationVersion()
{
return String::empty;
}
bool JUCEApplication::moreThanOneInstanceAllowed()
{
return true;
@ -183,6 +172,10 @@ bool JUCEApplication::initialiseApp (const String& commandLine)
// let the app do its setting-up..
initialise (commandLineParameters);
#if JUCE_MAC
juce_initialiseMacMainMenu(); // needs to be called after the app object has created, to get its name
#endif
// register for broadcast new app messages
MessageManager::getInstance()->registerBroadcastListener (this);