From 2a4395988404a76627a9e5d92bb3685953e0f14c Mon Sep 17 00:00:00 2001 From: Julian Storer Date: Thu, 17 Dec 2009 15:49:43 +0000 Subject: [PATCH] minor tweaks to TableHeaderComponent and ZipFiles --- juce_amalgamated.cpp | 4 +++- src/gui/components/controls/juce_TableHeaderComponent.cpp | 2 ++ src/io/files/juce_ZipFile.cpp | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index 070c30e238..906dfc4ff9 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -9552,7 +9552,7 @@ void ZipFile::init() break; ZipEntryInfo* const zei = new ZipEntryInfo(); - zei->entry.filename = String (buffer + 46, fileNameLen); + zei->entry.filename = String::fromUTF8 ((const uint8*) buffer + 46, fileNameLen); const int time = littleEndianShort (buffer + 12); const int date = littleEndianShort (buffer + 14); @@ -51026,6 +51026,8 @@ void TableHeaderComponent::showColumnChooserMenu (const int columnIdClicked) if (m.getNumItems() > 0) { + m.setLookAndFeel (&getLookAndFeel()); + const int result = m.show(); if (result != 0) diff --git a/src/gui/components/controls/juce_TableHeaderComponent.cpp b/src/gui/components/controls/juce_TableHeaderComponent.cpp index c78875e80c..41e7b07247 100644 --- a/src/gui/components/controls/juce_TableHeaderComponent.cpp +++ b/src/gui/components/controls/juce_TableHeaderComponent.cpp @@ -937,6 +937,8 @@ void TableHeaderComponent::showColumnChooserMenu (const int columnIdClicked) if (m.getNumItems() > 0) { + m.setLookAndFeel (&getLookAndFeel()); + const int result = m.show(); if (result != 0) diff --git a/src/io/files/juce_ZipFile.cpp b/src/io/files/juce_ZipFile.cpp index ab241bfb71..f393b86cf7 100644 --- a/src/io/files/juce_ZipFile.cpp +++ b/src/io/files/juce_ZipFile.cpp @@ -325,7 +325,7 @@ void ZipFile::init() break; ZipEntryInfo* const zei = new ZipEntryInfo(); - zei->entry.filename = String (buffer + 46, fileNameLen); + zei->entry.filename = String::fromUTF8 ((const uint8*) buffer + 46, fileNameLen); const int time = littleEndianShort (buffer + 12); const int date = littleEndianShort (buffer + 14);