diff options
Diffstat (limited to 'WebKit/wx')
| -rw-r--r-- | WebKit/wx/Bakefiles.bkgen | 123 | ||||
| -rw-r--r-- | WebKit/wx/ChangeLog | 32 | ||||
| -rw-r--r-- | WebKit/wx/WebKitSupport/EditorClientWx.cpp | 6 | ||||
| -rw-r--r-- | WebKit/wx/WebKitSupport/EditorClientWx.h | 4 | ||||
| -rw-r--r-- | WebKit/wx/bindings/python/wxwebkit-py.bkl | 0 | ||||
| -rw-r--r-- | WebKit/wx/dependencies.bkl | 0 | ||||
| -rw-r--r-- | WebKit/wx/presets/wxwebkit.bkl | 0 | ||||
| -rw-r--r-- | WebKit/wx/wxwebkit.bkl | 0 | ||||
| -rw-r--r-- | WebKit/wx/wxwk-settings.bkl | 0 |
9 files changed, 37 insertions, 128 deletions
diff --git a/WebKit/wx/Bakefiles.bkgen b/WebKit/wx/Bakefiles.bkgen deleted file mode 100644 index be544d6..0000000 --- a/WebKit/wx/Bakefiles.bkgen +++ /dev/null @@ -1,123 +0,0 @@ -<?xml version="1.0" ?> -<!-- -Copyright (C) 2005, 2006, 2007 Apple Computer, Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of - its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Build configuration script for Bakefile. ---> - -<bakefile-gen> - - <input> - ../../JavaScriptCore/jscore.bkl - ../../WebCore/webcore-wx.bkl - wxwebkit.bkl - bindings/python/wxwebkit-py.bkl - ../../WebKitTools/DumpRenderTree/wx/DumpRenderTree.bkl - ../../WebKitTools/wx/browser/browser.bkl - </input> - - <!-- List of output formats to generate: --> - <add-formats> - gnu,msvs2005prj,msvc - </add-formats> - - <!-- JSCore settings --> - <add-flags files="../../JavaScriptCore/jscore.bkl" formats="gnu"> - -o../../JavaScriptCore/GNUmakefile - </add-flags> - <add-flags files="../../JavaScriptCore/jscore.bkl" formats="msvs2005prj"> - -o../../JavaScriptCore/JavaScriptCore.sln - </add-flags> - <add-flags files="../../JavaScriptCore/jscore.bkl" formats="msvc"> - -o../../JavaScriptCore/makefile.vc - </add-flags> - <!-- testing XCode backend - <add-flags files="jscore.bkl" formats="xcode2"> - -o../WebCore/Projects/base/WebCoreBase.xcode - </add-flags> - --> - - <!-- wx port settings --> - <add-flags files="../../WebCore/webcore-wx.bkl" formats="gnu"> - -o../../WebCore/GNUmakefile - </add-flags> - <add-flags files="../../WebCore/webcore-wx.bkl" formats="msvs2005prj"> - -o../../WebCore/webcore-wx.sln - </add-flags> - <add-flags files="../../WebCore/webcore-wx.bkl" formats="msvc"> - -o../../WebCore/makefile.vc - </add-flags> - - <add-flags files="wxwebkit.bkl" formats="gnu"> - -oGNUmakefile - </add-flags> - <add-flags files="wxwebkit.bkl" formats="msvs2005prj"> - -owxWebKit.sln - </add-flags> - <add-flags files="wxwebkit.bkl" formats="msvc"> - -omakefile.vc - </add-flags> - - <add-flags files="bindings/python/wxwebkit-py.bkl" formats="gnu"> - -obindings/python/GNUmakefile - </add-flags> - <add-flags files="bindings/python/wxwebkit-py.bkl" formats="msvs2005prj"> - -obindings/python/wxWebKit.sln - </add-flags> - <add-flags files="bindings/python/wxwebkit-py.bkl" formats="msvc"> - -obindings/python/makefile.vc - </add-flags> - - <add-flags files="../../WebKitTools/wx/browser/browser.bkl" formats="gnu"> - -o../../WebKitTools/wx/browser/GNUmakefile - </add-flags> - <add-flags files="../../WebKitTools/wx/browser/browser.bkl" formats="msvs2005prj"> - -o../../WebKitTools/wx/browser/browser.sln - </add-flags> - <add-flags files="../../WebKitTools/wx/browser/browser.bkl" formats="msvc"> - -o../../WebKitTools/wx/browser/makefile.vc - </add-flags> - <!-- testing XCode backend - <add-flags files="webcore-wx.bkl" formats="xcode2"> - -o../WebCore/Projects/wx/wxWebCore.xcode - </add-flags> - --> - - <add-flags files="../../WebKitTools/DumpRenderTree/wx/DumpRenderTree.bkl" formats="gnu"> - -o../../WebKitTools/DumpRenderTree/wx/GNUmakefile - </add-flags> - <add-flags files="../../WebKitTools/DumpRenderTree/wx/DumpRenderTree.bkl" formats="msvs2005prj"> - -o../../WebKitTools/DumpRenderTree/wx/DumpRenderTree.sln - </add-flags> - <add-flags files="../../WebKitTools/DumpRenderTree/wx/DumpRenderTree.bkl" formats="msvc"> - -o../../WebKitTools/DumpRenderTree/wx/makefile.vc - </add-flags> - - <!-- Personal customizations (not in SVN): --> - <include file="Bakefiles.local.bkgen" ignore_missing="1"/> - -</bakefile-gen> diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog index e0f0cd1..ee07fbd 100644 --- a/WebKit/wx/ChangeLog +++ b/WebKit/wx/ChangeLog @@ -1,3 +1,35 @@ +2010-12-01 Jia Pu <jpu@apple.com> + + Reviewed by Darin Adler. + + Support multiple correction candidates panel for misspelled word on Mac OS X. + https://bugs.webkit.org/show_bug.cgi?id=50137 + <rdar://problem/8568059> + + Adopted new function signature defined in base class. + + * WebKitSupport/EditorClientWx.cpp: + (WebCore::EditorClientWx::getGuessesForWord): + * WebKitSupport/EditorClientWx.h: + +2010-11-24 Patrick Gansterer <paroga@webkit.org> + + Reviewed by Csaba Osztrogonác. + + Remove Bakefile build system files + https://bugs.webkit.org/show_bug.cgi?id=49983 + + r53757 only removed the content, but not the files. + This patch removes that empty files. + + * Bakefiles.bkgen: Removed. + * bindings/python/wxwebkit-py.bkl: Removed. + * dependencies.bkl: Removed. + * presets: Removed. + * presets/wxwebkit.bkl: Removed. + * wxwebkit.bkl: Removed. + * wxwk-settings.bkl: Removed. + 2010-11-08 Alexey Proskuryakov <ap@apple.com> Reviewed by Darin Adler. diff --git a/WebKit/wx/WebKitSupport/EditorClientWx.cpp b/WebKit/wx/WebKitSupport/EditorClientWx.cpp index 59e2fd4..5601364 100644 --- a/WebKit/wx/WebKitSupport/EditorClientWx.cpp +++ b/WebKit/wx/WebKitSupport/EditorClientWx.cpp @@ -542,9 +542,9 @@ bool EditorClientWx::spellingUIIsShowing() return false; } -void EditorClientWx::getGuessesForWord(const String&, Vector<String>& guesses) -{ - notImplemented(); +void EditorClientWx::getGuessesForWord(const String& word, const String& context, Vector<String>& guesses) +{ + notImplemented(); } String EditorClientWx::getAutoCorrectSuggestionForMisspelledWord(const WTF::String&) diff --git a/WebKit/wx/WebKitSupport/EditorClientWx.h b/WebKit/wx/WebKitSupport/EditorClientWx.h index be5c98a..35a95ab 100644 --- a/WebKit/wx/WebKitSupport/EditorClientWx.h +++ b/WebKit/wx/WebKitSupport/EditorClientWx.h @@ -107,9 +107,9 @@ public: virtual void updateSpellingUIWithMisspelledWord(const String&); virtual void showSpellingUI(bool show); virtual bool spellingUIIsShowing(); - virtual void getGuessesForWord(const String&, Vector<String>& guesses); + virtual void getGuessesForWord(const String& word, const String& context, Vector<String>& guesses); virtual String getAutoCorrectSuggestionForMisspelledWord(const WTF::String&); - + virtual void willSetInputMethodState(); virtual void setInputMethodState(bool enabled); diff --git a/WebKit/wx/bindings/python/wxwebkit-py.bkl b/WebKit/wx/bindings/python/wxwebkit-py.bkl deleted file mode 100644 index e69de29..0000000 --- a/WebKit/wx/bindings/python/wxwebkit-py.bkl +++ /dev/null diff --git a/WebKit/wx/dependencies.bkl b/WebKit/wx/dependencies.bkl deleted file mode 100644 index e69de29..0000000 --- a/WebKit/wx/dependencies.bkl +++ /dev/null diff --git a/WebKit/wx/presets/wxwebkit.bkl b/WebKit/wx/presets/wxwebkit.bkl deleted file mode 100644 index e69de29..0000000 --- a/WebKit/wx/presets/wxwebkit.bkl +++ /dev/null diff --git a/WebKit/wx/wxwebkit.bkl b/WebKit/wx/wxwebkit.bkl deleted file mode 100644 index e69de29..0000000 --- a/WebKit/wx/wxwebkit.bkl +++ /dev/null diff --git a/WebKit/wx/wxwk-settings.bkl b/WebKit/wx/wxwk-settings.bkl deleted file mode 100644 index e69de29..0000000 --- a/WebKit/wx/wxwk-settings.bkl +++ /dev/null |