From aabc0dbe6ecf8715e46c6351e9a5c4e7d0f9f86c Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 29 Nov 2011 15:11:14 +0000 Subject: [PATCH] Couple of minor linux + android fixes. --- modules/juce_graphics/native/juce_android_Fonts.cpp | 2 +- modules/juce_graphics/native/juce_linux_Fonts.cpp | 2 +- .../native/juce_android_WebBrowserComponent.cpp | 6 ++---- .../native/juce_linux_WebBrowserComponent.cpp | 6 ++---- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/juce_graphics/native/juce_android_Fonts.cpp b/modules/juce_graphics/native/juce_android_Fonts.cpp index 7400c48b8f..058a39c051 100644 --- a/modules/juce_graphics/native/juce_android_Fonts.cpp +++ b/modules/juce_graphics/native/juce_android_Fonts.cpp @@ -219,7 +219,7 @@ Typeface::Ptr Typeface::createSystemTypefaceFor (const Font& font) return new AndroidTypeface (font); } -bool GlyphLayout::createNativeLayout (const AttributedString&) +bool TextLayout::createNativeLayout (const AttributedString&) { return false; } diff --git a/modules/juce_graphics/native/juce_linux_Fonts.cpp b/modules/juce_graphics/native/juce_linux_Fonts.cpp index 66055ee642..d4f534ab5f 100644 --- a/modules/juce_graphics/native/juce_linux_Fonts.cpp +++ b/modules/juce_graphics/native/juce_linux_Fonts.cpp @@ -543,7 +543,7 @@ Typeface::Ptr Font::getDefaultTypefaceForFont (const Font& font) return Typeface::createSystemTypefaceFor (f); } -bool GlyphLayout::createNativeLayout (const AttributedString&) +bool TextLayout::createNativeLayout (const AttributedString&) { return false; } diff --git a/modules/juce_gui_extra/native/juce_android_WebBrowserComponent.cpp b/modules/juce_gui_extra/native/juce_android_WebBrowserComponent.cpp index 4a71d8aa5a..069162497d 100644 --- a/modules/juce_gui_extra/native/juce_android_WebBrowserComponent.cpp +++ b/modules/juce_gui_extra/native/juce_android_WebBrowserComponent.cpp @@ -109,7 +109,5 @@ void WebBrowserComponent::visibilityChanged() checkWindowAssociation(); } -bool WebBrowserComponent::pageAboutToLoad (const String& url) -{ - return true; -} +bool WebBrowserComponent::pageAboutToLoad (const String&) { return true; } +void WebBrowserComponent::pageFinishedLoading (const String&) {} diff --git a/modules/juce_gui_extra/native/juce_linux_WebBrowserComponent.cpp b/modules/juce_gui_extra/native/juce_linux_WebBrowserComponent.cpp index e76a45dde0..3eab4c9b52 100644 --- a/modules/juce_gui_extra/native/juce_linux_WebBrowserComponent.cpp +++ b/modules/juce_gui_extra/native/juce_linux_WebBrowserComponent.cpp @@ -114,7 +114,5 @@ void WebBrowserComponent::visibilityChanged() checkWindowAssociation(); } -bool WebBrowserComponent::pageAboutToLoad (const String& url) -{ - return true; -} +bool WebBrowserComponent::pageAboutToLoad (const String&) { return true; } +void WebBrowserComponent::pageFinishedLoading (const String&) {}