@@ -157,7 +157,7 @@ public: | |||||
{ | { | ||||
for (int i = activeUIs.size(); --i >= 0;) | for (int i = activeUIs.size(); --i >= 0;) | ||||
[((JuceUIViewClass*) activeUIs.getUnchecked(i)) filterBeingDeleted: this]; | [((JuceUIViewClass*) activeUIs.getUnchecked(i)) filterBeingDeleted: this]; | ||||
delete juceFilter; | delete juceFilter; | ||||
juceFilter = 0; | juceFilter = 0; | ||||
@@ -1053,7 +1053,7 @@ public: | |||||
deleteAndZero (editorComp); | deleteAndZero (editorComp); | ||||
} | } | ||||
editorComp = 0; | editorComp = 0; | ||||
} | } | ||||
@@ -11,27 +11,15 @@ namespace BinaryData | |||||
extern const char* camerademo_cpp; | extern const char* camerademo_cpp; | ||||
const int camerademo_cppSize = 7155; | const int camerademo_cppSize = 7155; | ||||
extern const char* cello_wav; | |||||
const int cello_wavSize = 46348; | |||||
extern const char* demo_table_data_xml; | |||||
const int demo_table_data_xmlSize = 5239; | |||||
extern const char* draganddropdemo_cpp; | extern const char* draganddropdemo_cpp; | ||||
const int draganddropdemo_cppSize = 7724; | const int draganddropdemo_cppSize = 7724; | ||||
extern const char* fontsandtextdemo_cpp; | extern const char* fontsandtextdemo_cpp; | ||||
const int fontsandtextdemo_cppSize = 8851; | const int fontsandtextdemo_cppSize = 8851; | ||||
extern const char* icons_zip; | |||||
const int icons_zipSize = 83876; | |||||
extern const char* interprocesscommsdemo_cpp; | extern const char* interprocesscommsdemo_cpp; | ||||
const int interprocesscommsdemo_cppSize = 12418; | const int interprocesscommsdemo_cppSize = 12418; | ||||
extern const char* juce_png; | |||||
const int juce_pngSize = 15290; | |||||
extern const char* opengldemo_cpp; | extern const char* opengldemo_cpp; | ||||
const int opengldemo_cppSize = 9362; | const int opengldemo_cppSize = 9362; | ||||
@@ -50,9 +38,6 @@ namespace BinaryData | |||||
extern const char* threadingdemo_cpp; | extern const char* threadingdemo_cpp; | ||||
const int threadingdemo_cppSize = 10271; | const int threadingdemo_cppSize = 10271; | ||||
extern const char* treedemo_xml; | |||||
const int treedemo_xmlSize = 1126; | |||||
extern const char* treeviewdemo_cpp; | extern const char* treeviewdemo_cpp; | ||||
const int treeviewdemo_cppSize = 8502; | const int treeviewdemo_cppSize = 8502; | ||||
@@ -62,6 +47,21 @@ namespace BinaryData | |||||
extern const char* widgetsdemo_cpp; | extern const char* widgetsdemo_cpp; | ||||
const int widgetsdemo_cppSize = 53176; | const int widgetsdemo_cppSize = 53176; | ||||
extern const char* cello_wav; | |||||
const int cello_wavSize = 46348; | |||||
extern const char* demo_table_data_xml; | |||||
const int demo_table_data_xmlSize = 5239; | |||||
extern const char* icons_zip; | |||||
const int icons_zipSize = 83876; | |||||
extern const char* juce_png; | |||||
const int juce_pngSize = 15290; | |||||
extern const char* treedemo_xml; | |||||
const int treedemo_xmlSize = 1126; | |||||
}; | }; | ||||
#endif | #endif |
@@ -78,7 +78,7 @@ public: | |||||
//============================================================================== | //============================================================================== | ||||
/** Returns the current gradient information */ | /** Returns the current gradient information */ | ||||
const ColourGradient& getGradient() const throw() { return gradient; } | const ColourGradient& getGradient() const throw() { return gradient; } | ||||
//============================================================================== | //============================================================================== | ||||
Brush* createCopy() const throw(); | Brush* createCopy() const throw(); | ||||
@@ -34,7 +34,7 @@ BEGIN_JUCE_NAMESPACE | |||||
#include "../../../io/files/juce_FileInputStream.h" | #include "../../../io/files/juce_FileInputStream.h" | ||||
//============================================================================== | //============================================================================== | ||||
Drawable::RenderingContext::RenderingContext (Graphics& g_, | |||||
Drawable::RenderingContext::RenderingContext (Graphics& g_, | |||||
const AffineTransform& transform_, | const AffineTransform& transform_, | ||||
const float opacity_) throw() | const float opacity_) throw() | ||||
: g (g_), | : g (g_), | ||||
@@ -281,6 +281,9 @@ | |||||
#ifndef __JUCE_SOLIDCOLOURBRUSH_JUCEHEADER__ | #ifndef __JUCE_SOLIDCOLOURBRUSH_JUCEHEADER__ | ||||
#include "gui/graphics/brushes/juce_SolidColourBrush.h" | #include "gui/graphics/brushes/juce_SolidColourBrush.h" | ||||
#endif | #endif | ||||
#ifndef __JUCE_COLOUR_JUCEHEADER__ | |||||
#include "gui/graphics/colour/juce_Colour.h" | |||||
#endif | |||||
#ifndef __JUCE_COLOURGRADIENT_JUCEHEADER__ | #ifndef __JUCE_COLOURGRADIENT_JUCEHEADER__ | ||||
#include "gui/graphics/colour/juce_ColourGradient.h" | #include "gui/graphics/colour/juce_ColourGradient.h" | ||||
#endif | #endif | ||||
@@ -290,9 +293,6 @@ | |||||
#ifndef __JUCE_PIXELFORMATS_JUCEHEADER__ | #ifndef __JUCE_PIXELFORMATS_JUCEHEADER__ | ||||
#include "gui/graphics/colour/juce_PixelFormats.h" | #include "gui/graphics/colour/juce_PixelFormats.h" | ||||
#endif | #endif | ||||
#ifndef __JUCE_COLOUR_JUCEHEADER__ | |||||
#include "gui/graphics/colour/juce_Colour.h" | |||||
#endif | |||||
#ifndef __JUCE_FONT_JUCEHEADER__ | #ifndef __JUCE_FONT_JUCEHEADER__ | ||||
#include "gui/graphics/fonts/juce_Font.h" | #include "gui/graphics/fonts/juce_Font.h" | ||||
#endif | #endif | ||||
@@ -437,9 +437,6 @@ | |||||
#ifndef __JUCE_REDUCEOPACITYEFFECT_JUCEHEADER__ | #ifndef __JUCE_REDUCEOPACITYEFFECT_JUCEHEADER__ | ||||
#include "gui/graphics/effects/juce_ReduceOpacityEffect.h" | #include "gui/graphics/effects/juce_ReduceOpacityEffect.h" | ||||
#endif | #endif | ||||
#ifndef __JUCE_KEYBOARDFOCUSTRAVERSER_JUCEHEADER__ | |||||
#include "gui/components/keyboard/juce_KeyboardFocusTraverser.h" | |||||
#endif | |||||
#ifndef __JUCE_KEYLISTENER_JUCEHEADER__ | #ifndef __JUCE_KEYLISTENER_JUCEHEADER__ | ||||
#include "gui/components/keyboard/juce_KeyListener.h" | #include "gui/components/keyboard/juce_KeyListener.h" | ||||
#endif | #endif | ||||
@@ -452,6 +449,9 @@ | |||||
#ifndef __JUCE_KEYPRESSMAPPINGSET_JUCEHEADER__ | #ifndef __JUCE_KEYPRESSMAPPINGSET_JUCEHEADER__ | ||||
#include "gui/components/keyboard/juce_KeyPressMappingSet.h" | #include "gui/components/keyboard/juce_KeyPressMappingSet.h" | ||||
#endif | #endif | ||||
#ifndef __JUCE_KEYBOARDFOCUSTRAVERSER_JUCEHEADER__ | |||||
#include "gui/components/keyboard/juce_KeyboardFocusTraverser.h" | |||||
#endif | |||||
#ifndef __JUCE_MODIFIERKEYS_JUCEHEADER__ | #ifndef __JUCE_MODIFIERKEYS_JUCEHEADER__ | ||||
#include "gui/components/keyboard/juce_ModifierKeys.h" | #include "gui/components/keyboard/juce_ModifierKeys.h" | ||||
#endif | #endif | ||||
@@ -626,9 +626,6 @@ | |||||
#ifndef __JUCE_FILELISTCOMPONENT_JUCEHEADER__ | #ifndef __JUCE_FILELISTCOMPONENT_JUCEHEADER__ | ||||
#include "gui/components/filebrowser/juce_FileListComponent.h" | #include "gui/components/filebrowser/juce_FileListComponent.h" | ||||
#endif | #endif | ||||
#ifndef __JUCE_FILENAMECOMPONENT_JUCEHEADER__ | |||||
#include "gui/components/filebrowser/juce_FilenameComponent.h" | |||||
#endif | |||||
#ifndef __JUCE_FILEPREVIEWCOMPONENT_JUCEHEADER__ | #ifndef __JUCE_FILEPREVIEWCOMPONENT_JUCEHEADER__ | ||||
#include "gui/components/filebrowser/juce_FilePreviewComponent.h" | #include "gui/components/filebrowser/juce_FilePreviewComponent.h" | ||||
#endif | #endif | ||||
@@ -638,6 +635,9 @@ | |||||
#ifndef __JUCE_FILETREECOMPONENT_JUCEHEADER__ | #ifndef __JUCE_FILETREECOMPONENT_JUCEHEADER__ | ||||
#include "gui/components/filebrowser/juce_FileTreeComponent.h" | #include "gui/components/filebrowser/juce_FileTreeComponent.h" | ||||
#endif | #endif | ||||
#ifndef __JUCE_FILENAMECOMPONENT_JUCEHEADER__ | |||||
#include "gui/components/filebrowser/juce_FilenameComponent.h" | |||||
#endif | |||||
#ifndef __JUCE_IMAGEPREVIEWCOMPONENT_JUCEHEADER__ | #ifndef __JUCE_IMAGEPREVIEWCOMPONENT_JUCEHEADER__ | ||||
#include "gui/components/filebrowser/juce_ImagePreviewComponent.h" | #include "gui/components/filebrowser/juce_ImagePreviewComponent.h" | ||||
#endif | #endif | ||||
@@ -719,29 +719,29 @@ | |||||
#ifndef __JUCE_OLDSCHOOLLOOKANDFEEL_JUCEHEADER__ | #ifndef __JUCE_OLDSCHOOLLOOKANDFEEL_JUCEHEADER__ | ||||
#include "gui/components/lookandfeel/juce_OldSchoolLookAndFeel.h" | #include "gui/components/lookandfeel/juce_OldSchoolLookAndFeel.h" | ||||
#endif | #endif | ||||
#ifndef __JUCE_UNDOMANAGER_JUCEHEADER__ | |||||
#include "utilities/juce_UndoManager.h" | |||||
#ifndef __JUCE_DELETEDATSHUTDOWN_JUCEHEADER__ | |||||
#include "utilities/juce_DeletedAtShutdown.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_SYSTEMCLIPBOARD_JUCEHEADER__ | |||||
#include "utilities/juce_SystemClipboard.h" | |||||
#ifndef __JUCE_FILEBASEDDOCUMENT_JUCEHEADER__ | |||||
#include "utilities/juce_FileBasedDocument.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_PROPERTIESFILE_JUCEHEADER__ | #ifndef __JUCE_PROPERTIESFILE_JUCEHEADER__ | ||||
#include "utilities/juce_PropertiesFile.h" | #include "utilities/juce_PropertiesFile.h" | ||||
#endif | #endif | ||||
#ifndef __JUCE_UNDOABLEACTION_JUCEHEADER__ | |||||
#include "utilities/juce_UndoableAction.h" | |||||
#ifndef __JUCE_RECENTLYOPENEDFILESLIST_JUCEHEADER__ | |||||
#include "utilities/juce_RecentlyOpenedFilesList.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_SELECTEDITEMSET_JUCEHEADER__ | #ifndef __JUCE_SELECTEDITEMSET_JUCEHEADER__ | ||||
#include "utilities/juce_SelectedItemSet.h" | #include "utilities/juce_SelectedItemSet.h" | ||||
#endif | #endif | ||||
#ifndef __JUCE_DELETEDATSHUTDOWN_JUCEHEADER__ | |||||
#include "utilities/juce_DeletedAtShutdown.h" | |||||
#ifndef __JUCE_SYSTEMCLIPBOARD_JUCEHEADER__ | |||||
#include "utilities/juce_SystemClipboard.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_RECENTLYOPENEDFILESLIST_JUCEHEADER__ | |||||
#include "utilities/juce_RecentlyOpenedFilesList.h" | |||||
#ifndef __JUCE_UNDOMANAGER_JUCEHEADER__ | |||||
#include "utilities/juce_UndoManager.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_FILEBASEDDOCUMENT_JUCEHEADER__ | |||||
#include "utilities/juce_FileBasedDocument.h" | |||||
#ifndef __JUCE_UNDOABLEACTION_JUCEHEADER__ | |||||
#include "utilities/juce_UndoableAction.h" | |||||
#endif | #endif | ||||
#endif | #endif |
@@ -26,26 +26,20 @@ | |||||
#ifndef __JUCE_JUCE_CORE_INCLUDES_INCLUDEFILES__ | #ifndef __JUCE_JUCE_CORE_INCLUDES_INCLUDEFILES__ | ||||
#define __JUCE_JUCE_CORE_INCLUDES_INCLUDEFILES__ | #define __JUCE_JUCE_CORE_INCLUDES_INCLUDEFILES__ | ||||
#ifndef __JUCE_TIME_JUCEHEADER__ | |||||
#include "core/juce_Time.h" | |||||
#endif | |||||
#ifndef __JUCE_STANDARDHEADER_JUCEHEADER__ | |||||
#include "core/juce_StandardHeader.h" | |||||
#endif | |||||
#ifndef __JUCE_SYSTEMSTATS_JUCEHEADER__ | |||||
#include "core/juce_SystemStats.h" | |||||
#ifndef __JUCE_ATOMIC_JUCEHEADER__ | |||||
#include "core/juce_Atomic.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_SINGLETON_JUCEHEADER__ | |||||
#include "core/juce_Singleton.h" | |||||
#ifndef __JUCE_DATACONVERSIONS_JUCEHEADER__ | |||||
#include "core/juce_DataConversions.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_RELATIVETIME_JUCEHEADER__ | |||||
#include "core/juce_RelativeTime.h" | |||||
#ifndef __JUCE_FILELOGGER_JUCEHEADER__ | |||||
#include "core/juce_FileLogger.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_PLATFORMDEFS_JUCEHEADER__ | |||||
#include "core/juce_PlatformDefs.h" | |||||
#ifndef __JUCE_INITIALISATION_JUCEHEADER__ | |||||
#include "core/juce_Initialisation.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_RANDOM_JUCEHEADER__ | |||||
#include "core/juce_Random.h" | |||||
#ifndef __JUCE_LOGGER_JUCEHEADER__ | |||||
#include "core/juce_Logger.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_MATHSFUNCTIONS_JUCEHEADER__ | #ifndef __JUCE_MATHSFUNCTIONS_JUCEHEADER__ | ||||
#include "core/juce_MathsFunctions.h" | #include "core/juce_MathsFunctions.h" | ||||
@@ -53,29 +47,35 @@ | |||||
#ifndef __JUCE_MEMORY_JUCEHEADER__ | #ifndef __JUCE_MEMORY_JUCEHEADER__ | ||||
#include "core/juce_Memory.h" | #include "core/juce_Memory.h" | ||||
#endif | #endif | ||||
#ifndef __JUCE_LOGGER_JUCEHEADER__ | |||||
#include "core/juce_Logger.h" | |||||
#ifndef __JUCE_PERFORMANCECOUNTER_JUCEHEADER__ | |||||
#include "core/juce_PerformanceCounter.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_INITIALISATION_JUCEHEADER__ | |||||
#include "core/juce_Initialisation.h" | |||||
#ifndef __JUCE_PLATFORMDEFS_JUCEHEADER__ | |||||
#include "core/juce_PlatformDefs.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_FILELOGGER_JUCEHEADER__ | |||||
#include "core/juce_FileLogger.h" | |||||
#ifndef __JUCE_PLATFORMUTILITIES_JUCEHEADER__ | |||||
#include "core/juce_PlatformUtilities.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_DATACONVERSIONS_JUCEHEADER__ | |||||
#include "core/juce_DataConversions.h" | |||||
#ifndef __JUCE_RANDOM_JUCEHEADER__ | |||||
#include "core/juce_Random.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_ATOMIC_JUCEHEADER__ | |||||
#include "core/juce_Atomic.h" | |||||
#ifndef __JUCE_RELATIVETIME_JUCEHEADER__ | |||||
#include "core/juce_RelativeTime.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_UUID_JUCEHEADER__ | |||||
#include "core/juce_Uuid.h" | |||||
#ifndef __JUCE_SINGLETON_JUCEHEADER__ | |||||
#include "core/juce_Singleton.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_PERFORMANCECOUNTER_JUCEHEADER__ | |||||
#include "core/juce_PerformanceCounter.h" | |||||
#ifndef __JUCE_STANDARDHEADER_JUCEHEADER__ | |||||
#include "core/juce_StandardHeader.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_PLATFORMUTILITIES_JUCEHEADER__ | |||||
#include "core/juce_PlatformUtilities.h" | |||||
#ifndef __JUCE_SYSTEMSTATS_JUCEHEADER__ | |||||
#include "core/juce_SystemStats.h" | |||||
#endif | |||||
#ifndef __JUCE_TIME_JUCEHEADER__ | |||||
#include "core/juce_Time.h" | |||||
#endif | |||||
#ifndef __JUCE_UUID_JUCEHEADER__ | |||||
#include "core/juce_Uuid.h" | |||||
#endif | #endif | ||||
#ifndef __JUCE_ARRAY_JUCEHEADER__ | #ifndef __JUCE_ARRAY_JUCEHEADER__ | ||||
#include "containers/juce_Array.h" | #include "containers/juce_Array.h" | ||||
@@ -170,21 +170,21 @@ | |||||
#ifndef __JUCE_INPUTSOURCE_JUCEHEADER__ | #ifndef __JUCE_INPUTSOURCE_JUCEHEADER__ | ||||
#include "io/streams/juce_InputSource.h" | #include "io/streams/juce_InputSource.h" | ||||
#endif | #endif | ||||
#ifndef __JUCE_INPUTSTREAM_JUCEHEADER__ | |||||
#include "io/streams/juce_InputStream.h" | |||||
#endif | |||||
#ifndef __JUCE_MEMORYINPUTSTREAM_JUCEHEADER__ | #ifndef __JUCE_MEMORYINPUTSTREAM_JUCEHEADER__ | ||||
#include "io/streams/juce_MemoryInputStream.h" | #include "io/streams/juce_MemoryInputStream.h" | ||||
#endif | #endif | ||||
#ifndef __JUCE_MEMORYOUTPUTSTREAM_JUCEHEADER__ | #ifndef __JUCE_MEMORYOUTPUTSTREAM_JUCEHEADER__ | ||||
#include "io/streams/juce_MemoryOutputStream.h" | #include "io/streams/juce_MemoryOutputStream.h" | ||||
#endif | #endif | ||||
#ifndef __JUCE_SUBREGIONSTREAM_JUCEHEADER__ | |||||
#include "io/streams/juce_SubregionStream.h" | |||||
#endif | |||||
#ifndef __JUCE_INPUTSTREAM_JUCEHEADER__ | |||||
#include "io/streams/juce_InputStream.h" | |||||
#endif | |||||
#ifndef __JUCE_OUTPUTSTREAM_JUCEHEADER__ | #ifndef __JUCE_OUTPUTSTREAM_JUCEHEADER__ | ||||
#include "io/streams/juce_OutputStream.h" | #include "io/streams/juce_OutputStream.h" | ||||
#endif | #endif | ||||
#ifndef __JUCE_SUBREGIONSTREAM_JUCEHEADER__ | |||||
#include "io/streams/juce_SubregionStream.h" | |||||
#endif | |||||
#ifndef __JUCE_CHARACTERFUNCTIONS_JUCEHEADER__ | #ifndef __JUCE_CHARACTERFUNCTIONS_JUCEHEADER__ | ||||
#include "text/juce_CharacterFunctions.h" | #include "text/juce_CharacterFunctions.h" | ||||
#endif | #endif | ||||