Commit 1431b3a8 authored by darin's avatar darin

WebCore:

        Reviewed by Adele.

        - remove obsolete WebCoreScrollView class

        * WebCore.exp: Remove WebCoreScrollView class name.

        * kwq/WebCoreScrollView.h: Removed.
        * kwq/WebCoreScrollView.m: Removed.
        * WebCore.xcodeproj/project.pbxproj: Remove WebCoreScrollView source files.

        * kwq/KWQListBox.mm: (-[KWQListBoxScrollView autoforwardsScrollWheelEvents]): Added.
        * kwq/KWQTextArea.h: Change base class to NSScrollView instead of WebCoreScrollView.
        * kwq/KWQTextArea.mm: (-[KWQTextAreaTextView autoforwardsScrollWheelEvents]): Ditto.

WebKit:

        Reviewed by Adele.

        - remove obsolete WebCoreScrollView class

        * WebView/WebDynamicScrollBarsView.h: Change base class to NSScrollView instead of WebCoreScrollView.
        * WebView/WebDynamicScrollBarsView.m: (-[WebDynamicScrollBarsView autoforwardsScrollWheelEvents]): Added.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@13062 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent d7ecdb85
2006-02-28 Darin Adler <darin@apple.com>
Reviewed by Adele.
- remove obsolete WebCoreScrollView class
* WebCore.exp: Remove WebCoreScrollView class name.
* kwq/WebCoreScrollView.h: Removed.
* kwq/WebCoreScrollView.m: Removed.
* WebCore.xcodeproj/project.pbxproj: Remove WebCoreScrollView source files.
* kwq/KWQListBox.mm: (-[KWQListBoxScrollView autoforwardsScrollWheelEvents]): Added.
* kwq/KWQTextArea.h: Change base class to NSScrollView instead of WebCoreScrollView.
* kwq/KWQTextArea.mm: (-[KWQTextAreaTextView autoforwardsScrollWheelEvents]): Ditto.
2006-02-28 Eric Seidel <eseidel@apple.com>
Reviewed by mjs.
......
......@@ -114,7 +114,6 @@
.objc_class_name_WebCoreJavaScript
.objc_class_name_WebCoreKeyGenerator
.objc_class_name_WebCoreScriptDebugger
.objc_class_name_WebCoreScrollView
.objc_class_name_WebCoreSettings
.objc_class_name_WebCoreTextDecoder
.objc_class_name_WebCoreTextRendererFactory
......
......@@ -283,7 +283,6 @@
93F199AB08245E59001E9ABC /* WebCoreImageRendererFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587854E02DE375901EA4122 /* WebCoreImageRendererFactory.h */; settings = {ATTRIBUTES = (Private, ); }; };
93F199AC08245E59001E9ABC /* WebCoreJavaScript.h in Headers */ = {isa = PBXBuildFile; fileRef = F5B2A52B02E22573018635CB /* WebCoreJavaScript.h */; settings = {ATTRIBUTES = (Private, ); }; };
93F199AD08245E59001E9ABC /* WebCoreResourceLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = F587855002DE375901EA4122 /* WebCoreResourceLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
93F199AE08245E59001E9ABC /* WebCoreScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = 9325AAB7041D0E9A00A9CAC5 /* WebCoreScrollView.h */; settings = {ATTRIBUTES = (Private, ); }; };
93F199AF08245E59001E9ABC /* WebCoreSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = F565AE8502ECA583018635CA /* WebCoreSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
93F199B008245E59001E9ABC /* WebCoreTextRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = F587855102DE375901EA4122 /* WebCoreTextRenderer.h */; settings = {ATTRIBUTES = (Private, ); }; };
93F199B108245E59001E9ABC /* WebCoreTextRendererFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = F587855202DE375901EA4122 /* WebCoreTextRendererFactory.h */; settings = {ATTRIBUTES = (Private, ); }; };
......@@ -401,7 +400,6 @@
93F19ACD08245E59001E9ABC /* KWQResourceLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93386B91037045B3008635CE /* KWQResourceLoader.mm */; };
93F19AD208245E59001E9ABC /* KWQPageState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9394E0A503AA5BBE008635CE /* KWQPageState.mm */; };
93F19AD508245E59001E9ABC /* KWQRenderTreeDebug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93955A4203D72932008635CE /* KWQRenderTreeDebug.cpp */; };
93F19ADB08245E59001E9ABC /* WebCoreScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9325AAB8041D0E9A00A9CAC5 /* WebCoreScrollView.m */; };
93F19ADC08245E59001E9ABC /* KWQScrollBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC7B2AF90450824100A8000F /* KWQScrollBar.mm */; };
93F19ADF08245E59001E9ABC /* KWQAccObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 55998A5B052B59CC0017A6C1 /* KWQAccObject.mm */; };
93F19AE008245E59001E9ABC /* KWQAccObjectCache.mm in Sources */ = {isa = PBXBuildFile; fileRef = 55998A5D052B59CC0017A6C1 /* KWQAccObjectCache.mm */; };
......@@ -1214,8 +1212,6 @@
93032CC709AEC34300F82A18 /* PathCG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PathCG.cpp; sourceTree = "<group>"; };
93032CC909AEC34B00F82A18 /* Path.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Path.h; path = platform/Path.h; sourceTree = "<group>"; };
9305B24C098F1B6B00C28855 /* Timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Timer.h; path = platform/Timer.h; sourceTree = "<group>"; };
9325AAB7041D0E9A00A9CAC5 /* WebCoreScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreScrollView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
9325AAB8041D0E9A00A9CAC5 /* WebCoreScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebCoreScrollView.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
9327A94109968D1A0068A546 /* HTMLOptionsCollectionImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLOptionsCollectionImpl.cpp; sourceTree = "<group>"; };
93309D87099E64910056E581 /* AppendNodeCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppendNodeCommand.cpp; sourceTree = "<group>"; };
93309D88099E64910056E581 /* AppendNodeCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppendNodeCommand.h; sourceTree = "<group>"; };
......@@ -3787,8 +3783,6 @@
F587855002DE375901EA4122 /* WebCoreResourceLoader.h */,
7E6FEED60898582300C44C3F /* WebCoreScriptDebugger.h */,
7E6FEED70898582300C44C3F /* WebCoreScriptDebugger.mm */,
9325AAB7041D0E9A00A9CAC5 /* WebCoreScrollView.h */,
9325AAB8041D0E9A00A9CAC5 /* WebCoreScrollView.m */,
F565AE8502ECA583018635CA /* WebCoreSettings.h */,
F565AE8602ECA583018635CA /* WebCoreSettings.mm */,
E1EE773508F1086C00166870 /* WebCoreTextDecoder.h */,
......@@ -3980,7 +3974,6 @@
93F199AB08245E59001E9ABC /* WebCoreImageRendererFactory.h in Headers */,
93F199AC08245E59001E9ABC /* WebCoreJavaScript.h in Headers */,
93F199AD08245E59001E9ABC /* WebCoreResourceLoader.h in Headers */,
93F199AE08245E59001E9ABC /* WebCoreScrollView.h in Headers */,
93F199AF08245E59001E9ABC /* WebCoreSettings.h in Headers */,
93F199B008245E59001E9ABC /* WebCoreTextRenderer.h in Headers */,
93F199B108245E59001E9ABC /* WebCoreTextRendererFactory.h in Headers */,
......@@ -5128,7 +5121,6 @@
93F19ACD08245E59001E9ABC /* KWQResourceLoader.mm in Sources */,
93F19AD208245E59001E9ABC /* KWQPageState.mm in Sources */,
93F19AD508245E59001E9ABC /* KWQRenderTreeDebug.cpp in Sources */,
93F19ADB08245E59001E9ABC /* WebCoreScrollView.m in Sources */,
93F19ADC08245E59001E9ABC /* KWQScrollBar.mm in Sources */,
93F19ADF08245E59001E9ABC /* KWQAccObject.mm in Sources */,
93F19AE008245E59001E9ABC /* KWQAccObjectCache.mm in Sources */,
......
......@@ -30,7 +30,6 @@
#import "KWQView.h"
#import "MacFrame.h"
#import "WebCoreFrameBridge.h"
#import "WebCoreScrollView.h"
#import "WebCoreTextRenderer.h"
#import "WebCoreTextRendererFactory.h"
#import <kxmlcore/Assertions.h>
......@@ -44,9 +43,7 @@ const float bottomMargin = 1;
const float leftMargin = 2;
const float rightMargin = 2;
@interface KWQListBoxScrollView : WebCoreScrollView <KWQWidgetHolder>
{
}
@interface KWQListBoxScrollView : NSScrollView <KWQWidgetHolder>
@end
@interface KWQTableView : NSTableView <KWQWidgetHolder>
......@@ -402,6 +399,11 @@ void QListBox::setFont(const QFont &font)
return YES;
}
- (BOOL)autoforwardsScrollWheelEvents
{
return YES;
}
@end
static Boolean KWQTableViewTypeSelectCallback(UInt32 index, void *listDataPtr, void *refcon, CFStringRef *outString, UCTypeSelectOptions *tsOptions)
......
......@@ -23,13 +23,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#import <WebCore/WebCoreScrollView.h>
#import <Cocoa/Cocoa.h>
@class KWQTextAreaTextView;
class QTextEdit;
@protocol KWQWidgetHolder;
@interface KWQTextArea : WebCoreScrollView <KWQWidgetHolder>
@interface KWQTextArea : NSScrollView <KWQWidgetHolder>
{
KWQTextAreaTextView *textView;
QTextEdit *widget;
......
......@@ -825,6 +825,11 @@ static NSRange RangeOfParagraph(NSString *text, int paragraph)
[super viewWillMoveToWindow:window];
}
- (BOOL)autoforwardsScrollWheelEvents
{
return YES;
}
@end
@implementation KWQTextAreaTextView
......@@ -1275,4 +1280,4 @@ static NSString *WebContinuousSpellCheckingEnabled = @"WebContinuousSpellCheckin
}
}
@end
\ No newline at end of file
@end
/*
* Copyright (C) 2003 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.
*
* THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 COMPUTER, INC. OR
* 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.
*/
#import <AppKit/AppKit.h>
@interface WebCoreScrollView : NSScrollView
{
}
@end
/*
* Copyright (C) 2005 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.
*
* THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 COMPUTER, INC. OR
* 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.
*/
#import "WebCoreScrollView.h"
@implementation WebCoreScrollView
- (BOOL)autoforwardsScrollWheelEvents
{
return YES;
}
@end
2006-02-28 Darin Adler <darin@apple.com>
Reviewed by Adele.
- remove obsolete WebCoreScrollView class
* WebView/WebDynamicScrollBarsView.h: Change base class to NSScrollView instead of WebCoreScrollView.
* WebView/WebDynamicScrollBarsView.m: (-[WebDynamicScrollBarsView autoforwardsScrollWheelEvents]): Added.
2006-02-28 John Sullivan <sullivan@apple.com>
Reviewed by Eric Seidel
......
......@@ -27,12 +27,11 @@
*/
#import <WebCore/WebCoreFrameView.h>
#import <WebCore/WebCoreScrollView.h>
// FIXME 2980779: This has grown to be more than just a dynamic scroll bar view,
// and it is no longer completely appropriate for use outside of WebKit.
@interface WebDynamicScrollBarsView : WebCoreScrollView <WebCoreFrameView>
@interface WebDynamicScrollBarsView : NSScrollView <WebCoreFrameView>
{
WebCoreScrollBarMode hScroll;
WebCoreScrollBarMode vScroll;
......
......@@ -208,4 +208,10 @@ - (void)setScrollingMode:(WebCoreScrollBarMode)mode
vScroll = hScroll = mode;
[self updateScrollers];
}
- (BOOL)autoforwardsScrollWheelEvents
{
return YES;
}
@end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment