diff --git a/extras/JuceDemo/Source/demos/AudioDemoLatencyPage.cpp b/extras/JuceDemo/Source/demos/AudioDemoLatencyPage.cpp index e556ba54f7..bc9822f8d3 100644 --- a/extras/JuceDemo/Source/demos/AudioDemoLatencyPage.cpp +++ b/extras/JuceDemo/Source/demos/AudioDemoLatencyPage.cpp @@ -3,7 +3,7 @@ This is an automatically generated file created by the Jucer! - Creation date: 18 Sep 2009 5:32:11 pm + Creation date: 1 May 2011 1:54:50pm Be careful when adding custom code to these files, as only the code within the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded @@ -289,7 +289,7 @@ AudioDemoLatencyPage::AudioDemoLatencyPage (AudioDeviceManager& deviceManager_) addAndMakeVisible (liveAudioDisplayComp = new LiveAudioInputDisplayComp()); addAndMakeVisible (startTestButton = new TextButton (String::empty)); - startTestButton->setButtonText ("Test Latency"); + startTestButton->setButtonText (L"Test Latency"); startTestButton->addListener (this); addAndMakeVisible (testResultsBox = new TextEditor (String::empty)); @@ -302,7 +302,7 @@ AudioDemoLatencyPage::AudioDemoLatencyPage (AudioDeviceManager& deviceManager_) testResultsBox->setColour (TextEditor::backgroundColourId, Colour (0x32ffffff)); testResultsBox->setColour (TextEditor::outlineColourId, Colour (0x1c000000)); testResultsBox->setColour (TextEditor::shadowColourId, Colour (0x16000000)); - testResultsBox->setText ("Running this test measures the round-trip latency between the audio output and input devices you\'ve got selected.\n\nIt\'ll play a sound, then try to measure the time at which the sound arrives back at the audio input. Obviously for this to work you need to have your microphone somewhere near your speakers..."); + testResultsBox->setText (L"Running this test measures the round-trip latency between the audio output and input devices you\'ve got selected.\n\nIt\'ll play a sound, then try to measure the time at which the sound arrives back at the audio input. Obviously for this to work you need to have your microphone somewhere near your speakers..."); //[UserPreSize] @@ -310,6 +310,7 @@ AudioDemoLatencyPage::AudioDemoLatencyPage (AudioDeviceManager& deviceManager_) setSize (600, 400); + //[Constructor] You can add your own custom stuff here.. deviceManager.addAudioCallback (liveAudioDisplayComp); @@ -330,6 +331,7 @@ AudioDemoLatencyPage::~AudioDemoLatencyPage() deleteAndZero (startTestButton); deleteAndZero (testResultsBox); + //[Destructor]. You can add your own custom destruction code here.. //[/Destructor] } diff --git a/extras/JuceDemo/Source/demos/AudioDemoLatencyPage.h b/extras/JuceDemo/Source/demos/AudioDemoLatencyPage.h index f918bcd7cb..6ee1efaee9 100644 --- a/extras/JuceDemo/Source/demos/AudioDemoLatencyPage.h +++ b/extras/JuceDemo/Source/demos/AudioDemoLatencyPage.h @@ -3,7 +3,7 @@ This is an automatically generated file created by the Jucer! - Creation date: 18 Sep 2009 5:32:11 pm + Creation date: 1 May 2011 1:54:50pm Be careful when adding custom code to these files, as only the code within the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded @@ -19,8 +19,8 @@ ============================================================================== */ -#ifndef __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_BFCD772A__ -#define __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_BFCD772A__ +#ifndef __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_7C897E97__ +#define __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_7C897E97__ //[Headers] -- You can add your own extra header files here -- #include "../jucedemo_headers.h" @@ -55,6 +55,7 @@ public: void buttonClicked (Button* buttonThatWasClicked); + //============================================================================== juce_UseDebuggingNewOperator @@ -69,6 +70,7 @@ private: TextButton* startTestButton; TextEditor* testResultsBox; + //============================================================================== // (prevent copy constructor and operator= being generated..) AudioDemoLatencyPage (const AudioDemoLatencyPage&); @@ -76,4 +78,4 @@ private: }; -#endif // __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_BFCD772A__ +#endif // __JUCER_HEADER_AUDIODEMOLATENCYPAGE_AUDIODEMOLATENCYPAGE_7C897E97__ diff --git a/extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.cpp b/extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.cpp index 34c05634bd..c4a0e1d21e 100644 --- a/extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.cpp +++ b/extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.cpp @@ -3,7 +3,7 @@ This is an automatically generated file created by the Jucer! - Creation date: 18 Sep 2009 7:17:11 pm + Creation date: 1 May 2011 12:08:14pm Be careful when adding custom code to these files, as only the code within the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded @@ -133,7 +133,7 @@ AudioDemoPlaybackPage::AudioDemoPlaybackPage (AudioDeviceManager& deviceManager_ zoomSlider (0) { addAndMakeVisible (zoomLabel = new Label (String::empty, - T("zoom:"))); + L"zoom:")); zoomLabel->setFont (Font (15.0000f, Font::plain)); zoomLabel->setJustificationType (Justification::centredRight); zoomLabel->setEditable (false, false, false); @@ -143,14 +143,14 @@ AudioDemoPlaybackPage::AudioDemoPlaybackPage (AudioDeviceManager& deviceManager_ addAndMakeVisible (thumbnail = new DemoThumbnailComp()); addAndMakeVisible (startStopButton = new TextButton (String::empty)); - startStopButton->setButtonText (T("Play/Stop")); + startStopButton->setButtonText (L"Play/Stop"); startStopButton->addListener (this); startStopButton->setColour (TextButton::buttonColourId, Colour (0xff79ed7f)); addAndMakeVisible (fileTreeComp = new FileTreeComponent (directoryList)); addAndMakeVisible (explanation = new Label (String::empty, - T("Select an audio file in the treeview above, and this page will display its waveform, and let you play it.."))); + L"Select an audio file in the treeview above, and this page will display its waveform, and let you play it..")); explanation->setFont (Font (14.0000f, Font::plain)); explanation->setJustificationType (Justification::bottomRight); explanation->setEditable (false, false, false); @@ -170,6 +170,7 @@ AudioDemoPlaybackPage::AudioDemoPlaybackPage (AudioDeviceManager& deviceManager_ setSize (600, 400); + //[Constructor] You can add your own custom stuff here.. directoryList.setDirectory (File::getSpecialLocation (File::userHomeDirectory), true, true); thread.startThread (3); @@ -199,6 +200,7 @@ AudioDemoPlaybackPage::~AudioDemoPlaybackPage() deleteAndZero (explanation); deleteAndZero (zoomSlider); + //[Destructor]. You can add your own custom destruction code here.. //[/Destructor] } diff --git a/extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.h b/extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.h index ee4431a0b1..aaf1ce52bd 100644 --- a/extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.h +++ b/extras/JuceDemo/Source/demos/AudioDemoPlaybackPage.h @@ -3,7 +3,7 @@ This is an automatically generated file created by the Jucer! - Creation date: 18 Sep 2009 7:17:11 pm + Creation date: 1 May 2011 12:08:14pm Be careful when adding custom code to these files, as only the code within the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded @@ -19,8 +19,8 @@ ============================================================================== */ -#ifndef __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_8AB55057__ -#define __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_8AB55057__ +#ifndef __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_81B4F279__ +#define __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_81B4F279__ //[Headers] -- You can add your own extra header files here -- #include "../jucedemo_headers.h" @@ -63,6 +63,7 @@ public: void sliderValueChanged (Slider* sliderThatWasMoved); + //============================================================================== juce_UseDebuggingNewOperator @@ -87,6 +88,7 @@ private: Label* explanation; Slider* zoomSlider; + //============================================================================== // (prevent copy constructor and operator= being generated..) AudioDemoPlaybackPage (const AudioDemoPlaybackPage&); @@ -94,4 +96,4 @@ private: }; -#endif // __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_8AB55057__ +#endif // __JUCER_HEADER_AUDIODEMOPLAYBACKPAGE_AUDIODEMOPLAYBACKPAGE_81B4F279__ diff --git a/extras/JuceDemo/Source/demos/AudioDemoRecordPage.cpp b/extras/JuceDemo/Source/demos/AudioDemoRecordPage.cpp index 72a76a6ddf..031cc8da1e 100644 --- a/extras/JuceDemo/Source/demos/AudioDemoRecordPage.cpp +++ b/extras/JuceDemo/Source/demos/AudioDemoRecordPage.cpp @@ -3,7 +3,7 @@ This is an automatically generated file created by the Jucer! - Creation date: 13 Nov 2009 3:52:50 pm + Creation date: 1 May 2011 12:08:25pm Be careful when adding custom code to these files, as only the code within the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded @@ -146,7 +146,7 @@ AudioDemoRecordPage::AudioDemoRecordPage (AudioDeviceManager& deviceManager_) addAndMakeVisible (liveAudioDisplayComp = new LiveAudioInputDisplayComp()); addAndMakeVisible (explanationLabel = new Label (String::empty, - T("This page demonstrates how to record a wave file from the live audio input..\n\nPressing record will start recording a file in your \"Documents\" folder."))); + L"This page demonstrates how to record a wave file from the live audio input..\n\nPressing record will start recording a file in your \"Documents\" folder.")); explanationLabel->setFont (Font (15.0000f, Font::plain)); explanationLabel->setJustificationType (Justification::topLeft); explanationLabel->setEditable (false, false, false); @@ -154,10 +154,10 @@ AudioDemoRecordPage::AudioDemoRecordPage (AudioDeviceManager& deviceManager_) explanationLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); addAndMakeVisible (recordButton = new TextButton (String::empty)); - recordButton->setButtonText (T("Record")); + recordButton->setButtonText (L"Record"); recordButton->addListener (this); recordButton->setColour (TextButton::buttonColourId, Colour (0xffff5c5c)); - recordButton->setColour (TextButton::textColourOffId, Colours::black); + recordButton->setColour (TextButton::textColourOnId, Colours::black); //[UserPreSize] @@ -165,6 +165,7 @@ AudioDemoRecordPage::AudioDemoRecordPage (AudioDeviceManager& deviceManager_) setSize (600, 400); + //[Constructor] You can add your own custom stuff here.. recorder = new AudioRecorder(); deviceManager.addAudioCallback (recorder); @@ -184,6 +185,7 @@ AudioDemoRecordPage::~AudioDemoRecordPage() deleteAndZero (explanationLabel); deleteAndZero (recordButton); + //[Destructor]. You can add your own custom destruction code here.. //[/Destructor] } diff --git a/extras/JuceDemo/Source/demos/AudioDemoRecordPage.h b/extras/JuceDemo/Source/demos/AudioDemoRecordPage.h index f31b6e17da..4ab42d9441 100644 --- a/extras/JuceDemo/Source/demos/AudioDemoRecordPage.h +++ b/extras/JuceDemo/Source/demos/AudioDemoRecordPage.h @@ -3,7 +3,7 @@ This is an automatically generated file created by the Jucer! - Creation date: 13 Nov 2009 3:52:50 pm + Creation date: 1 May 2011 12:08:25pm Be careful when adding custom code to these files, as only the code within the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded @@ -19,8 +19,8 @@ ============================================================================== */ -#ifndef __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_4FF281BF__ -#define __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_4FF281BF__ +#ifndef __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_E12E1947__ +#define __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_E12E1947__ //[Headers] -- You can add your own extra header files here -- #include "../jucedemo_headers.h" @@ -56,6 +56,7 @@ public: void visibilityChanged(); + //============================================================================== juce_UseDebuggingNewOperator @@ -70,6 +71,7 @@ private: Label* explanationLabel; TextButton* recordButton; + //============================================================================== // (prevent copy constructor and operator= being generated..) AudioDemoRecordPage (const AudioDemoRecordPage&); @@ -77,4 +79,4 @@ private: }; -#endif // __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_4FF281BF__ +#endif // __JUCER_HEADER_AUDIODEMORECORDPAGE_AUDIODEMORECORDPAGE_E12E1947__ diff --git a/extras/JuceDemo/Source/demos/AudioDemoSetupPage.cpp b/extras/JuceDemo/Source/demos/AudioDemoSetupPage.cpp index 95f282ab9d..18bfd52e8c 100644 --- a/extras/JuceDemo/Source/demos/AudioDemoSetupPage.cpp +++ b/extras/JuceDemo/Source/demos/AudioDemoSetupPage.cpp @@ -3,7 +3,7 @@ This is an automatically generated file created by the Jucer! - Creation date: 18 Sep 2009 11:26:45 am + Creation date: 1 May 2011 1:54:18pm Be careful when adding custom code to these files, as only the code within the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded @@ -41,6 +41,7 @@ AudioDemoSetupPage::AudioDemoSetupPage (AudioDeviceManager& deviceManager_) setSize (600, 400); + //[Constructor] You can add your own custom stuff here.. //[/Constructor] } @@ -52,6 +53,7 @@ AudioDemoSetupPage::~AudioDemoSetupPage() deleteAndZero (deviceSelector); + //[Destructor]. You can add your own custom destruction code here.. //[/Destructor] } diff --git a/extras/JuceDemo/Source/demos/AudioDemoSetupPage.h b/extras/JuceDemo/Source/demos/AudioDemoSetupPage.h index ee574301b7..ee651a2ee8 100644 --- a/extras/JuceDemo/Source/demos/AudioDemoSetupPage.h +++ b/extras/JuceDemo/Source/demos/AudioDemoSetupPage.h @@ -3,7 +3,7 @@ This is an automatically generated file created by the Jucer! - Creation date: 18 Sep 2009 11:26:45 am + Creation date: 1 May 2011 1:54:18pm Be careful when adding custom code to these files, as only the code within the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded @@ -19,8 +19,8 @@ ============================================================================== */ -#ifndef __JUCER_HEADER_AUDIODEMOSETUPPAGE_AUDIODEMOSETUPPAGE_244CE6A7__ -#define __JUCER_HEADER_AUDIODEMOSETUPPAGE_AUDIODEMOSETUPPAGE_244CE6A7__ +#ifndef __JUCER_HEADER_AUDIODEMOSETUPPAGE_AUDIODEMOSETUPPAGE_A3545895__ +#define __JUCER_HEADER_AUDIODEMOSETUPPAGE_AUDIODEMOSETUPPAGE_A3545895__ //[Headers] -- You can add your own extra header files here -- #include "../jucedemo_headers.h" @@ -51,6 +51,7 @@ public: void resized(); + //============================================================================== juce_UseDebuggingNewOperator @@ -62,11 +63,12 @@ private: //============================================================================== AudioDeviceSelectorComponent* deviceSelector; + //============================================================================== // (prevent copy constructor and operator= being generated..) AudioDemoSetupPage (const AudioDemoSetupPage&); - AudioDemoSetupPage& operator= (const AudioDemoSetupPage&); + const AudioDemoSetupPage& operator= (const AudioDemoSetupPage&); }; -#endif // __JUCER_HEADER_AUDIODEMOSETUPPAGE_AUDIODEMOSETUPPAGE_244CE6A7__ +#endif // __JUCER_HEADER_AUDIODEMOSETUPPAGE_AUDIODEMOSETUPPAGE_A3545895__ diff --git a/extras/JuceDemo/Source/demos/AudioDemoSynthPage.cpp b/extras/JuceDemo/Source/demos/AudioDemoSynthPage.cpp index 306dc6b1ef..8c2f3d0f4f 100644 --- a/extras/JuceDemo/Source/demos/AudioDemoSynthPage.cpp +++ b/extras/JuceDemo/Source/demos/AudioDemoSynthPage.cpp @@ -3,7 +3,7 @@ This is an automatically generated file created by the Jucer! - Creation date: 18 Sep 2009 9:46:49 pm + Creation date: 1 May 2011 12:06:00pm Be careful when adding custom code to these files, as only the code within the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded @@ -25,7 +25,7 @@ #include "AudioDemoSynthPage.h" -//[MiscUserDefs] +//[MiscUserDefs] You can add your own user definitions and misc code here... //============================================================================== /** Our demo synth sound is just a basic sine wave.. @@ -257,13 +257,13 @@ AudioDemoSynthPage::AudioDemoSynthPage (AudioDeviceManager& deviceManager_) addAndMakeVisible (keyboardComponent = new MidiKeyboardComponent (keyboardState, MidiKeyboardComponent::horizontalKeyboard)); addAndMakeVisible (sineButton = new ToggleButton (String::empty)); - sineButton->setButtonText (T("Use sine wave")); + sineButton->setButtonText (L"Use sine wave"); sineButton->setRadioGroupId (321); sineButton->addListener (this); sineButton->setToggleState (true, false); addAndMakeVisible (sampledButton = new ToggleButton (String::empty)); - sampledButton->setButtonText (T("Use sampled sound")); + sampledButton->setButtonText (L"Use sampled sound"); sampledButton->setRadioGroupId (321); sampledButton->addListener (this); @@ -275,6 +275,7 @@ AudioDemoSynthPage::AudioDemoSynthPage (AudioDeviceManager& deviceManager_) setSize (600, 400); + //[Constructor] You can add your own custom stuff here.. deviceManager.addAudioCallback (liveAudioDisplayComp); @@ -300,6 +301,7 @@ AudioDemoSynthPage::~AudioDemoSynthPage() deleteAndZero (sampledButton); deleteAndZero (liveAudioDisplayComp); + //[Destructor]. You can add your own custom destruction code here.. //[/Destructor] } diff --git a/extras/JuceDemo/Source/demos/AudioDemoSynthPage.h b/extras/JuceDemo/Source/demos/AudioDemoSynthPage.h index 6d7a8f6eb7..a6bf5cf9df 100644 --- a/extras/JuceDemo/Source/demos/AudioDemoSynthPage.h +++ b/extras/JuceDemo/Source/demos/AudioDemoSynthPage.h @@ -3,7 +3,7 @@ This is an automatically generated file created by the Jucer! - Creation date: 18 Sep 2009 9:46:49 pm + Creation date: 1 May 2011 12:06:00pm Be careful when adding custom code to these files, as only the code within the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded @@ -19,8 +19,8 @@ ============================================================================== */ -#ifndef __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_76557DC7__ -#define __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_76557DC7__ +#ifndef __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_1E55DCCB__ +#define __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_1E55DCCB__ //[Headers] -- You can add your own extra header files here -- #include "../jucedemo_headers.h" @@ -55,6 +55,7 @@ public: void buttonClicked (Button* buttonThatWasClicked); + //============================================================================== juce_UseDebuggingNewOperator @@ -72,6 +73,7 @@ private: ToggleButton* sampledButton; LiveAudioInputDisplayComp* liveAudioDisplayComp; + //============================================================================== // (prevent copy constructor and operator= being generated..) AudioDemoSynthPage (const AudioDemoSynthPage&); @@ -79,4 +81,4 @@ private: }; -#endif // __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_76557DC7__ +#endif // __JUCER_HEADER_AUDIODEMOSYNTHPAGE_AUDIODEMOSYNTHPAGE_1E55DCCB__ diff --git a/extras/JuceDemo/Source/demos/AudioDemoTabComponent.cpp b/extras/JuceDemo/Source/demos/AudioDemoTabComponent.cpp index e360763505..00874879a9 100644 --- a/extras/JuceDemo/Source/demos/AudioDemoTabComponent.cpp +++ b/extras/JuceDemo/Source/demos/AudioDemoTabComponent.cpp @@ -3,7 +3,7 @@ This is an automatically generated file created by the Jucer! - Creation date: 19 Sep 2009 11:10:57 am + Creation date: 1 May 2011 12:07:35pm Be careful when adding custom code to these files, as only the code within the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded @@ -116,11 +116,11 @@ AudioDemoTabComponent::AudioDemoTabComponent () { addAndMakeVisible (tabbedComponent = new TabbedComponent (TabbedButtonBar::TabsAtTop)); tabbedComponent->setTabBarDepth (30); - tabbedComponent->addTab (T("Audio Device Setup"), Colours::lightgrey, new AudioDemoSetupPage (deviceManager), true); - tabbedComponent->addTab (T("File Playback"), Colours::lightgrey, new AudioDemoPlaybackPage (deviceManager), true); - tabbedComponent->addTab (T("Synth Playback"), Colours::lightgrey, new AudioDemoSynthPage (deviceManager), true); - tabbedComponent->addTab (T("Latency Test"), Colours::lightgrey, new AudioDemoLatencyPage (deviceManager), true); - tabbedComponent->addTab (T("Recording"), Colours::lightgrey, new AudioDemoRecordPage (deviceManager), true); + tabbedComponent->addTab (L"Audio Device Setup", Colours::lightgrey, new AudioDemoSetupPage (deviceManager), true); + tabbedComponent->addTab (L"File Playback", Colours::lightgrey, new AudioDemoPlaybackPage (deviceManager), true); + tabbedComponent->addTab (L"Synth Playback", Colours::lightgrey, new AudioDemoSynthPage (deviceManager), true); + tabbedComponent->addTab (L"Latency Test", Colours::lightgrey, new AudioDemoLatencyPage (deviceManager), true); + tabbedComponent->addTab (L"Recording", Colours::lightgrey, new AudioDemoRecordPage (deviceManager), true); tabbedComponent->setCurrentTabIndex (0); @@ -130,6 +130,7 @@ AudioDemoTabComponent::AudioDemoTabComponent () setSize (600, 400); + //[Constructor] You can add your own custom stuff here.. //[/Constructor] } @@ -141,6 +142,7 @@ AudioDemoTabComponent::~AudioDemoTabComponent() deleteAndZero (tabbedComponent); + //[Destructor]. You can add your own custom destruction code here.. //[/Destructor] } diff --git a/extras/JuceDemo/Source/demos/AudioDemoTabComponent.h b/extras/JuceDemo/Source/demos/AudioDemoTabComponent.h index 768befdce9..e2c3fba3ec 100644 --- a/extras/JuceDemo/Source/demos/AudioDemoTabComponent.h +++ b/extras/JuceDemo/Source/demos/AudioDemoTabComponent.h @@ -3,7 +3,7 @@ This is an automatically generated file created by the Jucer! - Creation date: 19 Sep 2009 11:10:57 am + Creation date: 1 May 2011 12:07:35pm Be careful when adding custom code to these files, as only the code within the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded @@ -19,8 +19,8 @@ ============================================================================== */ -#ifndef __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_10720733__ -#define __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_10720733__ +#ifndef __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_ADE99E0E__ +#define __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_ADE99E0E__ //[Headers] -- You can add your own extra header files here -- #include "../jucedemo_headers.h" @@ -81,6 +81,7 @@ public: void resized(); + //============================================================================== juce_UseDebuggingNewOperator @@ -92,6 +93,7 @@ private: //============================================================================== TabbedComponent* tabbedComponent; + //============================================================================== // (prevent copy constructor and operator= being generated..) AudioDemoTabComponent (const AudioDemoTabComponent&); @@ -99,4 +101,4 @@ private: }; -#endif // __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_10720733__ +#endif // __JUCER_HEADER_AUDIODEMOTABCOMPONENT_AUDIODEMOTABCOMPONENT_ADE99E0E__ diff --git a/extras/JuceDemo/Source/demos/RenderingTestComponent.cpp b/extras/JuceDemo/Source/demos/RenderingTestComponent.cpp index c151d65708..c6e86cda6f 100644 --- a/extras/JuceDemo/Source/demos/RenderingTestComponent.cpp +++ b/extras/JuceDemo/Source/demos/RenderingTestComponent.cpp @@ -3,7 +3,7 @@ This is an automatically generated file created by the Jucer! - Creation date: 1 Dec 2009 9:04:27 pm + Creation date: 1 May 2011 12:07:57pm Be careful when adding custom code to these files, as only the code within the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded @@ -406,22 +406,22 @@ RenderingTestComponent::RenderingTestComponent () testTypeComboBox->setEditableText (false); testTypeComboBox->setJustificationType (Justification::centredLeft); testTypeComboBox->setTextWhenNothingSelected (String::empty); - testTypeComboBox->setTextWhenNoChoicesAvailable (T("(no choices)")); - testTypeComboBox->addItem (T("Paths - Solid"), 1); - testTypeComboBox->addItem (T("Paths - Linear gradient"), 2); - testTypeComboBox->addItem (T("Paths - Radial gradient"), 3); - testTypeComboBox->addItem (T("Paths - Stroked"), 4); - testTypeComboBox->addItem (T("Images - RGB"), 5); - testTypeComboBox->addItem (T("Images - ARGB"), 6); - testTypeComboBox->addItem (T("Tiled Images - RGB"), 7); - testTypeComboBox->addItem (T("Tiled Images - ARGB"), 8); - testTypeComboBox->addItem (T("Glyphs"), 9); - testTypeComboBox->addItem (T("SVG"), 10); - testTypeComboBox->addItem (T("Lines"), 11); + testTypeComboBox->setTextWhenNoChoicesAvailable (L"(no choices)"); + testTypeComboBox->addItem (L"Paths - Solid", 1); + testTypeComboBox->addItem (L"Paths - Linear gradient", 2); + testTypeComboBox->addItem (L"Paths - Radial gradient", 3); + testTypeComboBox->addItem (L"Paths - Stroked", 4); + testTypeComboBox->addItem (L"Images - RGB", 5); + testTypeComboBox->addItem (L"Images - ARGB", 6); + testTypeComboBox->addItem (L"Tiled Images - RGB", 7); + testTypeComboBox->addItem (L"Tiled Images - ARGB", 8); + testTypeComboBox->addItem (L"Glyphs", 9); + testTypeComboBox->addItem (L"SVG", 10); + testTypeComboBox->addItem (L"Lines", 11); testTypeComboBox->addListener (this); addAndMakeVisible (testTypeLabel = new Label (String::empty, - T("Test type:"))); + L"Test type:")); testTypeLabel->setFont (Font (15.0000f, Font::plain)); testTypeLabel->setJustificationType (Justification::centredRight); testTypeLabel->setEditable (false, false, false); @@ -429,7 +429,7 @@ RenderingTestComponent::RenderingTestComponent () testTypeLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); addAndMakeVisible (speedLabel = new Label (String::empty, - T("speed"))); + L"speed")); speedLabel->setFont (Font (15.0000f, Font::plain)); speedLabel->setJustificationType (Justification::centredLeft); speedLabel->setEditable (false, false, false); @@ -445,22 +445,22 @@ RenderingTestComponent::RenderingTestComponent () opacitySlider->addListener (this); addAndMakeVisible (highQualityToggle = new ToggleButton (String::empty)); - highQualityToggle->setButtonText (T("Higher quality image interpolation")); + highQualityToggle->setButtonText (L"Higher quality image interpolation"); addAndMakeVisible (animateSizeToggle = new ToggleButton (String::empty)); - animateSizeToggle->setButtonText (T("Animate size")); + animateSizeToggle->setButtonText (L"Animate size"); addAndMakeVisible (animateRotationToggle = new ToggleButton (String::empty)); - animateRotationToggle->setButtonText (T("Animate rotation")); + animateRotationToggle->setButtonText (L"Animate rotation"); addAndMakeVisible (animatePositionToggle = new ToggleButton (String::empty)); - animatePositionToggle->setButtonText (T("Animate position")); + animatePositionToggle->setButtonText (L"Animate position"); addAndMakeVisible (animateFillToggle = new ToggleButton (String::empty)); - animateFillToggle->setButtonText (T("Animate gradient")); + animateFillToggle->setButtonText (L"Animate gradient"); addAndMakeVisible (opacityLabel = new Label (String::empty, - T("Opacity:"))); + L"Opacity:")); opacityLabel->setFont (Font (15.0000f, Font::plain)); opacityLabel->setJustificationType (Justification::centredRight); opacityLabel->setEditable (false, false, false); @@ -493,7 +493,7 @@ RenderingTestComponent::RenderingTestComponent () angleSlider->addListener (this); addAndMakeVisible (xSliderLabel = new Label (String::empty, - T("X offset:"))); + L"X offset:")); xSliderLabel->setFont (Font (15.0000f, Font::plain)); xSliderLabel->setJustificationType (Justification::centredRight); xSliderLabel->setEditable (false, false, false); @@ -501,7 +501,7 @@ RenderingTestComponent::RenderingTestComponent () xSliderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); addAndMakeVisible (ySliderLabel = new Label (String::empty, - T("Y offset:"))); + L"Y offset:")); ySliderLabel->setFont (Font (15.0000f, Font::plain)); ySliderLabel->setJustificationType (Justification::centredRight); ySliderLabel->setEditable (false, false, false); @@ -509,7 +509,7 @@ RenderingTestComponent::RenderingTestComponent () ySliderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); addAndMakeVisible (sizeSliderLabel = new Label (String::empty, - T("Size:"))); + L"Size:")); sizeSliderLabel->setFont (Font (15.0000f, Font::plain)); sizeSliderLabel->setJustificationType (Justification::centredRight); sizeSliderLabel->setEditable (false, false, false); @@ -517,7 +517,7 @@ RenderingTestComponent::RenderingTestComponent () sizeSliderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); addAndMakeVisible (angleSliderLabel = new Label (String::empty, - T("Angle:"))); + L"Angle:")); angleSliderLabel->setFont (Font (15.0000f, Font::plain)); angleSliderLabel->setJustificationType (Justification::centredRight); angleSliderLabel->setEditable (false, false, false); @@ -525,13 +525,13 @@ RenderingTestComponent::RenderingTestComponent () angleSliderLabel->setColour (TextEditor::backgroundColourId, Colour (0x0)); addAndMakeVisible (clipToRectangleToggle = new ToggleButton (String::empty)); - clipToRectangleToggle->setButtonText (T("Clip to rectangle")); + clipToRectangleToggle->setButtonText (L"Clip to rectangle"); addAndMakeVisible (clipToPathToggle = new ToggleButton (String::empty)); - clipToPathToggle->setButtonText (T("Clip to path")); + clipToPathToggle->setButtonText (L"Clip to path"); addAndMakeVisible (clipToImageToggle = new ToggleButton (String::empty)); - clipToImageToggle->setButtonText (T("Clip to image")); + clipToImageToggle->setButtonText (L"Clip to image"); //[UserPreSize] @@ -539,6 +539,7 @@ RenderingTestComponent::RenderingTestComponent () setSize (600, 400); + //[Constructor] You can add your own custom stuff here.. testTypeComboBox->setSelectedId (2); sizeSlider->setValue (1.0, false); @@ -575,6 +576,7 @@ RenderingTestComponent::~RenderingTestComponent() deleteAndZero (clipToPathToggle); deleteAndZero (clipToImageToggle); + //[Destructor]. You can add your own custom destruction code here.. //[/Destructor] } @@ -593,25 +595,25 @@ void RenderingTestComponent::paint (Graphics& g) void RenderingTestComponent::resized() { - testTypeComboBox->setBounds (proportionOfWidth (0.1652f), 16, proportionOfWidth (0.3425f), 24); - testTypeLabel->setBounds (proportionOfWidth (0.0275f), 16, proportionOfWidth (0.1291f), 24); - speedLabel->setBounds (proportionOfWidth (0.5370f), 16, proportionOfWidth (0.4303f), 24); + testTypeComboBox->setBounds (proportionOfWidth (0.1647f), 16, proportionOfWidth (0.3426f), 24); + testTypeLabel->setBounds (proportionOfWidth (0.0277f), 16, proportionOfWidth (0.1291f), 24); + speedLabel->setBounds (proportionOfWidth (0.5375f), 16, proportionOfWidth (0.4308f), 24); testCanvas->setBounds (20, 56, getWidth() - 40, getHeight() - 215); - opacitySlider->setBounds (proportionOfWidth (0.5990f), getHeight() - 141, proportionOfWidth (0.3787f), 24); - highQualityToggle->setBounds (proportionOfWidth (0.0224f), getHeight() - 141, proportionOfWidth (0.4458f), 24); - animateSizeToggle->setBounds (proportionOfWidth (0.7573f), getHeight() - 85, proportionOfWidth (0.2237f), 24); - animateRotationToggle->setBounds (proportionOfWidth (0.7573f), getHeight() - 61, proportionOfWidth (0.2237f), 24); - animatePositionToggle->setBounds (proportionOfWidth (0.7573f), getHeight() - 109, proportionOfWidth (0.2237f), 24); - animateFillToggle->setBounds (proportionOfWidth (0.7573f), getHeight() - 37, proportionOfWidth (0.2341f), 24); - opacityLabel->setBounds ((proportionOfWidth (0.5990f)) + -66, getHeight() - 141, 64, 24); - xSlider->setBounds (proportionOfWidth (0.3614f), getHeight() - 109, proportionOfWidth (0.3787f), 24); - ySlider->setBounds (proportionOfWidth (0.3614f), getHeight() - 85, proportionOfWidth (0.3787f), 24); - sizeSlider->setBounds (proportionOfWidth (0.3614f), getHeight() - 61, proportionOfWidth (0.3787f), 24); - angleSlider->setBounds (proportionOfWidth (0.3614f), getHeight() - 37, proportionOfWidth (0.3787f), 24); - xSliderLabel->setBounds (proportionOfWidth (0.2496f), getHeight() - 109, proportionOfWidth (0.1067f), 24); - ySliderLabel->setBounds (proportionOfWidth (0.2496f), getHeight() - 85, proportionOfWidth (0.1067f), 24); - sizeSliderLabel->setBounds (proportionOfWidth (0.2496f), getHeight() - 61, proportionOfWidth (0.1067f), 24); - angleSliderLabel->setBounds (proportionOfWidth (0.2496f), getHeight() - 37, proportionOfWidth (0.1067f), 24); + opacitySlider->setBounds (proportionOfWidth (0.5995f), getHeight() - 141, proportionOfWidth (0.3781f), 24); + highQualityToggle->setBounds (proportionOfWidth (0.0224f), getHeight() - 141, proportionOfWidth (0.4453f), 24); + animateSizeToggle->setBounds (proportionOfWidth (0.7576f), getHeight() - 85, proportionOfWidth (0.2240f), 24); + animateRotationToggle->setBounds (proportionOfWidth (0.7576f), getHeight() - 61, proportionOfWidth (0.2240f), 24); + animatePositionToggle->setBounds (proportionOfWidth (0.7576f), getHeight() - 109, proportionOfWidth (0.2240f), 24); + animateFillToggle->setBounds (proportionOfWidth (0.7576f), getHeight() - 37, proportionOfWidth (0.2345f), 24); + opacityLabel->setBounds ((proportionOfWidth (0.5995f)) + -66, getHeight() - 141, 64, 24); + xSlider->setBounds (proportionOfWidth (0.3610f), getHeight() - 109, proportionOfWidth (0.3781f), 24); + ySlider->setBounds (proportionOfWidth (0.3610f), getHeight() - 85, proportionOfWidth (0.3781f), 24); + sizeSlider->setBounds (proportionOfWidth (0.3610f), getHeight() - 61, proportionOfWidth (0.3781f), 24); + angleSlider->setBounds (proportionOfWidth (0.3610f), getHeight() - 37, proportionOfWidth (0.3781f), 24); + xSliderLabel->setBounds (proportionOfWidth (0.2490f), getHeight() - 109, proportionOfWidth (0.1067f), 24); + ySliderLabel->setBounds (proportionOfWidth (0.2490f), getHeight() - 85, proportionOfWidth (0.1067f), 24); + sizeSliderLabel->setBounds (proportionOfWidth (0.2490f), getHeight() - 61, proportionOfWidth (0.1067f), 24); + angleSliderLabel->setBounds (proportionOfWidth (0.2490f), getHeight() - 37, proportionOfWidth (0.1067f), 24); clipToRectangleToggle->setBounds (proportionOfWidth (0.0224f), getHeight() - 109, 144, 24); clipToPathToggle->setBounds (proportionOfWidth (0.0224f), getHeight() - 85, 144, 24); clipToImageToggle->setBounds (proportionOfWidth (0.0224f), getHeight() - 61, 144, 24); @@ -689,16 +691,16 @@ BEGIN_JUCER_METADATA fixedSize="0" initialWidth="600" initialHeight="400">