You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

128 lines
5.7KB

  1. diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.cpp b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.cpp
  2. index 3b88ccee0..cb6f1ce60 100644
  3. --- a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.cpp
  4. +++ b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.cpp
  5. @@ -40,8 +40,6 @@ AudioProcessorEditor::AudioProcessorEditor (AudioProcessor* p) noexcept : proce
  6. AudioProcessorEditor::~AudioProcessorEditor()
  7. {
  8. - splashScreen.deleteAndZero();
  9. -
  10. // if this fails, then the wrapper hasn't called editorBeingDeleted() on the
  11. // filter for some reason..
  12. jassert (processor.getActiveEditor() != this);
  13. @@ -56,23 +54,6 @@ void AudioProcessorEditor::hostMIDIControllerIsAvailable (bool) {
  14. void AudioProcessorEditor::initialise()
  15. {
  16. - /*
  17. - ==========================================================================
  18. - In accordance with the terms of the JUCE 7 End-Use License Agreement, the
  19. - JUCE Code in SECTION A cannot be removed, changed or otherwise rendered
  20. - ineffective unless you have a JUCE Indie or Pro license, or are using
  21. - JUCE under the GPL v3 license.
  22. -
  23. - End User License Agreement: www.juce.com/juce-7-licence
  24. - ==========================================================================
  25. - */
  26. -
  27. - // BEGIN SECTION A
  28. -
  29. - splashScreen = new JUCESplashScreen (*this);
  30. -
  31. - // END SECTION A
  32. -
  33. attachConstrainer (&defaultConstrainer);
  34. resizeListener.reset (new AudioProcessorEditorListener (*this));
  35. addComponentListener (resizeListener.get());
  36. diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h
  37. index df43af642..af1805ac3 100644
  38. --- a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h
  39. +++ b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h
  40. @@ -235,7 +235,6 @@ private:
  41. ComponentBoundsConstrainer defaultConstrainer;
  42. ComponentBoundsConstrainer* constrainer = nullptr;
  43. AudioProcessorEditorHostContext* hostContext = nullptr;
  44. - Component::SafePointer<Component> splashScreen;
  45. AffineTransform hostScaleTransform;
  46. JUCE_DECLARE_NON_COPYABLE (AudioProcessorEditor)
  47. diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp
  48. index 3ebe35f2b..944d25b1c 100644
  49. --- a/modules/juce_gui_basics/juce_gui_basics.cpp
  50. +++ b/modules/juce_gui_basics/juce_gui_basics.cpp
  51. @@ -252,7 +252,6 @@ namespace juce
  52. #include "misc/juce_BubbleComponent.cpp"
  53. #include "misc/juce_DropShadower.cpp"
  54. #include "misc/juce_FocusOutline.cpp"
  55. -#include "misc/juce_JUCESplashScreen.cpp"
  56. #include "layout/juce_FlexBox.cpp"
  57. #include "layout/juce_GridItem.cpp"
  58. diff --git a/modules/juce_gui_basics/juce_gui_basics.h b/modules/juce_gui_basics/juce_gui_basics.h
  59. index 40b367eb3..3f7368dd1 100644
  60. --- a/modules/juce_gui_basics/juce_gui_basics.h
  61. +++ b/modules/juce_gui_basics/juce_gui_basics.h
  62. @@ -265,7 +265,6 @@ namespace juce
  63. #include "buttons/juce_ToolbarButton.h"
  64. #include "misc/juce_DropShadower.h"
  65. #include "misc/juce_FocusOutline.h"
  66. -#include "misc/juce_JUCESplashScreen.h"
  67. #include "widgets/juce_TreeView.h"
  68. #include "windows/juce_TopLevelWindow.h"
  69. #include "windows/juce_MessageBoxOptions.h"
  70. diff --git a/modules/juce_gui_basics/windows/juce_ResizableWindow.cpp b/modules/juce_gui_basics/windows/juce_ResizableWindow.cpp
  71. index 8b711b504..db28b93a9 100644
  72. --- a/modules/juce_gui_basics/windows/juce_ResizableWindow.cpp
  73. +++ b/modules/juce_gui_basics/windows/juce_ResizableWindow.cpp
  74. @@ -41,8 +41,6 @@ ResizableWindow::ResizableWindow (const String& name, Colour bkgnd, bool shouldA
  75. ResizableWindow::~ResizableWindow()
  76. {
  77. - splashScreen.deleteAndZero();
  78. -
  79. // Don't delete or remove the resizer components yourself! They're managed by the
  80. // ResizableWindow, and you should leave them alone! You may have deleted them
  81. // accidentally by careless use of deleteAllChildren()..?
  82. @@ -60,27 +58,6 @@ ResizableWindow::~ResizableWindow()
  83. void ResizableWindow::initialise (const bool shouldAddToDesktop)
  84. {
  85. - /*
  86. - ==========================================================================
  87. -
  88. - In accordance with the terms of the JUCE 7 End-Use License Agreement, the
  89. - JUCE Code in SECTION A cannot be removed, changed or otherwise rendered
  90. - ineffective unless you have a JUCE Indie or Pro license, or are using
  91. - JUCE under the GPL v3 license.
  92. -
  93. - End User License Agreement: www.juce.com/juce-7-licence
  94. -
  95. - ==========================================================================
  96. - */
  97. -
  98. - // BEGIN SECTION A
  99. -
  100. - #if ! JucePlugin_Build_Standalone
  101. - splashScreen = new JUCESplashScreen (*this);
  102. - #endif
  103. -
  104. - // END SECTION A
  105. -
  106. defaultConstrainer.setMinimumOnscreenAmounts (0x10000, 16, 24, 16);
  107. lastNonFullScreenPos.setBounds (50, 50, 256, 256);
  108. diff --git a/modules/juce_gui_basics/windows/juce_ResizableWindow.h b/modules/juce_gui_basics/windows/juce_ResizableWindow.h
  109. index b381b73fb..d6469c35d 100644
  110. --- a/modules/juce_gui_basics/windows/juce_ResizableWindow.h
  111. +++ b/modules/juce_gui_basics/windows/juce_ResizableWindow.h
  112. @@ -391,7 +391,7 @@ protected:
  113. private:
  114. //==============================================================================
  115. - Component::SafePointer<Component> contentComponent, splashScreen;
  116. + Component::SafePointer<Component> contentComponent;
  117. bool ownsContentComponent = false, resizeToFitContent = false, fullscreen = false, canDrag = true, dragStarted = false;
  118. ComponentDragger dragger;
  119. Rectangle<int> lastNonFullScreenPos;