| @@ -825,7 +825,7 @@ public: | |||||
| if (! hasCreatedCaret) | if (! hasCreatedCaret) | ||||
| { | { | ||||
| hasCreatedCaret = true; | hasCreatedCaret = true; | ||||
| CreateCaret (hwnd, 0, 0, 0); | |||||
| CreateCaret (hwnd, (HBITMAP) 1, 0, 0); | |||||
| } | } | ||||
| ShowCaret (hwnd); | ShowCaret (hwnd); | ||||
| @@ -315,6 +315,13 @@ void TabbedComponent::resized() | |||||
| contentComponents.getUnchecked (i)->setBounds (bounds); | contentComponents.getUnchecked (i)->setBounds (bounds); | ||||
| } | } | ||||
| void TabbedComponent::lookAndFeelChanged() | |||||
| { | |||||
| for (int i = contentComponents.size(); --i >= 0;) | |||||
| if (contentComponents.getUnchecked (i) != 0) | |||||
| contentComponents.getUnchecked (i)->lookAndFeelChanged(); | |||||
| } | |||||
| void TabbedComponent::changeCallback (const int newCurrentTabIndex, | void TabbedComponent::changeCallback (const int newCurrentTabIndex, | ||||
| const String& newTabName) | const String& newTabName) | ||||
| { | { | ||||
| @@ -201,6 +201,8 @@ public: | |||||
| void paint (Graphics& g); | void paint (Graphics& g); | ||||
| /** @internal */ | /** @internal */ | ||||
| void resized(); | void resized(); | ||||
| /** @internal */ | |||||
| void lookAndFeelChanged(); | |||||
| juce_UseDebuggingNewOperator | juce_UseDebuggingNewOperator | ||||
| @@ -321,7 +321,8 @@ public: | |||||
| if (sampleRateDropDown != 0) | if (sampleRateDropDown != 0) | ||||
| { | { | ||||
| sampleRateDropDown->setVisible (! showAdvancedSettingsButton->isVisible()); | |||||
| sampleRateDropDown->setVisible (showAdvancedSettingsButton == 0 | |||||
| || ! showAdvancedSettingsButton->isVisible()); | |||||
| sampleRateDropDown->setBounds (lx, y, w, h); | sampleRateDropDown->setBounds (lx, y, w, h); | ||||
| y += dh; | y += dh; | ||||
| @@ -329,14 +330,16 @@ public: | |||||
| if (bufferSizeDropDown != 0) | if (bufferSizeDropDown != 0) | ||||
| { | { | ||||
| bufferSizeDropDown->setVisible (! showAdvancedSettingsButton->isVisible()); | |||||
| bufferSizeDropDown->setVisible (showAdvancedSettingsButton == 0 | |||||
| || ! showAdvancedSettingsButton->isVisible()); | |||||
| bufferSizeDropDown->setBounds (lx, y, w, h); | bufferSizeDropDown->setBounds (lx, y, w, h); | ||||
| y += dh; | y += dh; | ||||
| } | } | ||||
| if (showUIButton != 0) | if (showUIButton != 0) | ||||
| { | { | ||||
| showUIButton->setVisible (! showAdvancedSettingsButton->isVisible()); | |||||
| showUIButton->setVisible (showAdvancedSettingsButton == 0 | |||||
| || ! showAdvancedSettingsButton->isVisible()); | |||||
| showUIButton->changeWidthToFitText (h); | showUIButton->changeWidthToFitText (h); | ||||
| showUIButton->setTopLeftPosition (lx, y); | showUIButton->setTopLeftPosition (lx, y); | ||||
| } | } | ||||
| @@ -860,11 +860,13 @@ private: | |||||
| const String text (e->getText()); | const String text (e->getText()); | ||||
| Path path; | Path path; | ||||
| parseShape (*e, path); | |||||
| Drawable* s = parseShape (*e, path); | |||||
| delete s; | |||||
| } | } | ||||
| else if (e->hasTagName (T("tspan"))) | else if (e->hasTagName (T("tspan"))) | ||||
| { | { | ||||
| parseText (*e); | |||||
| Drawable* s = parseText (*e); | |||||
| delete s; | |||||
| } | } | ||||
| } | } | ||||
| @@ -277,17 +277,24 @@ bool GZIPDecompressorInputStream::setPosition (int64 newPos) | |||||
| { | { | ||||
| if (newPos != currentPos) | if (newPos != currentPos) | ||||
| { | { | ||||
| // reset the stream and start again.. | |||||
| GZIPDecompressHelper* const h = (GZIPDecompressHelper*) helper; | |||||
| delete h; | |||||
| if (newPos > currentPos) | |||||
| { | |||||
| skipNextBytes (newPos - currentPos); | |||||
| } | |||||
| else | |||||
| { | |||||
| // reset the stream and start again.. | |||||
| GZIPDecompressHelper* const h = (GZIPDecompressHelper*) helper; | |||||
| delete h; | |||||
| isEof = false; | |||||
| activeBufferSize = 0; | |||||
| currentPos = 0; | |||||
| helper = new GZIPDecompressHelper (noWrap); | |||||
| isEof = false; | |||||
| activeBufferSize = 0; | |||||
| currentPos = 0; | |||||
| helper = new GZIPDecompressHelper (noWrap); | |||||
| sourceStream->setPosition (originalSourcePos); | |||||
| skipNextBytes (newPos); | |||||
| sourceStream->setPosition (originalSourcePos); | |||||
| skipNextBytes (newPos); | |||||
| } | |||||
| } | } | ||||
| return true; | return true; | ||||