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.6KB

  1. diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.cpp b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.cpp
  2. index b980441c9..670cb3969 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 6 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-6-licence
  24. - ==========================================================================
  25. - */
  26. -
  27. - // BEGIN SECTION A
  28. -
  29. - splashScreen = new JUCESplashScreen (*this);
  30. -
  31. - // END SECTION A
  32. -
  33. resizable = false;
  34. attachConstrainer (&defaultConstrainer);
  35. diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h
  36. index ff694b78f..07d3765f4 100644
  37. --- a/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h
  38. +++ b/modules/juce_audio_processors/processors/juce_AudioProcessorEditor.h
  39. @@ -206,7 +206,6 @@ private:
  40. bool resizable;
  41. ComponentBoundsConstrainer defaultConstrainer;
  42. ComponentBoundsConstrainer* constrainer = {};
  43. - Component::SafePointer<Component> splashScreen;
  44. AffineTransform hostScaleTransform;
  45. JUCE_DECLARE_NON_COPYABLE (AudioProcessorEditor)
  46. diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp
  47. index 056ff591b..a4d798606 100644
  48. --- a/modules/juce_gui_basics/juce_gui_basics.cpp
  49. +++ b/modules/juce_gui_basics/juce_gui_basics.cpp
  50. @@ -218,7 +218,6 @@ namespace juce
  51. #include "application/juce_Application.cpp"
  52. #include "misc/juce_BubbleComponent.cpp"
  53. #include "misc/juce_DropShadower.cpp"
  54. -#include "misc/juce_JUCESplashScreen.cpp"
  55. #include "layout/juce_FlexBox.cpp"
  56. #include "layout/juce_GridItem.cpp"
  57. diff --git a/modules/juce_gui_basics/juce_gui_basics.h b/modules/juce_gui_basics/juce_gui_basics.h
  58. index 729461282..a4873d04b 100644
  59. --- a/modules/juce_gui_basics/juce_gui_basics.h
  60. +++ b/modules/juce_gui_basics/juce_gui_basics.h
  61. @@ -250,7 +250,6 @@ namespace juce
  62. #include "menus/juce_BurgerMenuComponent.h"
  63. #include "buttons/juce_ToolbarButton.h"
  64. #include "misc/juce_DropShadower.h"
  65. -#include "misc/juce_JUCESplashScreen.h"
  66. #include "widgets/juce_TreeView.h"
  67. #include "windows/juce_TopLevelWindow.h"
  68. #include "windows/juce_AlertWindow.h"
  69. diff --git a/modules/juce_gui_basics/windows/juce_ResizableWindow.cpp b/modules/juce_gui_basics/windows/juce_ResizableWindow.cpp
  70. index dc3c7279a..d1d20d6c7 100644
  71. --- a/modules/juce_gui_basics/windows/juce_ResizableWindow.cpp
  72. +++ b/modules/juce_gui_basics/windows/juce_ResizableWindow.cpp
  73. @@ -41,8 +41,6 @@ ResizableWindow::ResizableWindow (const String& name, Colour bkgnd, bool shouldA
  74. ResizableWindow::~ResizableWindow()
  75. {
  76. - splashScreen.deleteAndZero();
  77. -
  78. // Don't delete or remove the resizer components yourself! They're managed by the
  79. // ResizableWindow, and you should leave them alone! You may have deleted them
  80. // accidentally by careless use of deleteAllChildren()..?
  81. @@ -60,27 +58,6 @@ ResizableWindow::~ResizableWindow()
  82. void ResizableWindow::initialise (const bool shouldAddToDesktop)
  83. {
  84. - /*
  85. - ==========================================================================
  86. -
  87. - In accordance with the terms of the JUCE 6 End-Use License Agreement, the
  88. - JUCE Code in SECTION A cannot be removed, changed or otherwise rendered
  89. - ineffective unless you have a JUCE Indie or Pro license, or are using
  90. - JUCE under the GPL v3 license.
  91. -
  92. - End User License Agreement: www.juce.com/juce-6-licence
  93. -
  94. - ==========================================================================
  95. - */
  96. -
  97. - // BEGIN SECTION A
  98. -
  99. - #if ! JucePlugin_Build_Standalone
  100. - splashScreen = new JUCESplashScreen (*this);
  101. - #endif
  102. -
  103. - // END SECTION A
  104. -
  105. defaultConstrainer.setMinimumOnscreenAmounts (0x10000, 16, 24, 16);
  106. lastNonFullScreenPos.setBounds (50, 50, 256, 256);
  107. diff --git a/modules/juce_gui_basics/windows/juce_ResizableWindow.h b/modules/juce_gui_basics/windows/juce_ResizableWindow.h
  108. index d67303595..e59f620c1 100644
  109. --- a/modules/juce_gui_basics/windows/juce_ResizableWindow.h
  110. +++ b/modules/juce_gui_basics/windows/juce_ResizableWindow.h
  111. @@ -383,7 +383,7 @@ protected:
  112. private:
  113. //==============================================================================
  114. - Component::SafePointer<Component> contentComponent, splashScreen;
  115. + Component::SafePointer<Component> contentComponent;
  116. bool ownsContentComponent = false, resizeToFitContent = false, fullscreen = false, canDrag = true, dragStarted = false;
  117. ComponentDragger dragger;
  118. Rectangle<int> lastNonFullScreenPos;