Browse Source

tags/2021-05-28
jules 16 years ago
parent
commit
1e87237d8c
2 changed files with 6 additions and 2 deletions
  1. +1
    -1
      extras/juce demo/src/ApplicationStartup.cpp
  2. +5
    -1
      extras/juce demo/src/MainDemoWindow.cpp

+ 1
- 1
extras/juce demo/src/ApplicationStartup.cpp View File

@@ -43,7 +43,7 @@ class JUCEDemoApplication : public JUCEApplication
This is because the application object gets created before Juce has been properly This is because the application object gets created before Juce has been properly
initialised, so any embedded objects would also get constructed too soon. initialised, so any embedded objects would also get constructed too soon.
*/
*/
MainDemoWindow* theMainWindow; MainDemoWindow* theMainWindow;
public: public:


+ 5
- 1
extras/juce demo/src/MainDemoWindow.cpp View File

@@ -132,7 +132,7 @@ public:
currentDemoId (0), currentDemoId (0),
demoSourceCodeText (0) demoSourceCodeText (0)
{ {
invokeDirectly (showAudio, true);
invokeDirectly (showPathsAndTransforms, true);
} }
~ContentComp() ~ContentComp()
@@ -581,6 +581,10 @@ MainDemoWindow::~MainDemoWindow()
// have to switch this off before deleting the content comp.. // have to switch this off before deleting the content comp..
setMenuBar (0); setMenuBar (0);
#if JUCE_MAC // ..and also the main bar if we're using that on a Mac...
MenuBarModel::setMacMainMenu (0);
#endif
// setting our content component to 0 will delete the current one, and // setting our content component to 0 will delete the current one, and
// that will in turn delete all its child components. You don't always // that will in turn delete all its child components. You don't always
// have to do this explicitly, because the base class's destructor will // have to do this explicitly, because the base class's destructor will


Loading…
Cancel
Save