[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:35:35 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit a44cf409d07a580aa83f13e56bc8dbc539c3ed87
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Aug 30 17:50:28 2002 +0000
- fixed 3027407 -- Console error refers to closed bug
* kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::bridgeForFrameName):
Update bug number from 2959902 to 2942073.
- fixed 3027532 -- can't tab into or out of textareas
* kwq/KWQTextArea.h: Add setFont:.
* kwq/KWQTextArea.mm:
(-[KWQTextArea _createTextView]): Make a KWQTextAreaTextView.
(-[KWQTextArea textDidChange:]): Send text changed messages when the text
is changed, not when done editing. I did this for KWQNSTextField a while ago;
it's tragic that AppKit leads us to have two separate classes for these nearly
identical purposes.
(-[KWQTextArea setFont:]): Call setFont on the text view.
(-[KWQTextArea becomeFirstResponder]): Call makeFirstResponder on the text view.
(-[KWQTextArea nextKeyView]): Do that voodoo, just like KWQNSTextField.
(-[KWQTextArea previousKeyView]): Ditto.
(-[KWQTextArea nextValidKeyView]): Ditto.
(-[KWQTextArea previousValidKeyView]): Ditto.
(-[KWQTextAreaTextView insertTab:]): Select the next key view. We don't get this
automatically because this is not a field editor. But being a field editor leads
to other unwanted behavior.
(-[KWQTextAreaTextView insertBacktab:]): Ditto.
(-[KWQTextAreaTextView becomeFirstResponder]): Select all on entry.
(-[KWQTextAreaTextView shouldDrawInsertionPoint]): Don't draw insertion point
when we are not the first responder.
(-[KWQTextAreaTextView selectedTextAttributes]): Don't draw the selection when
we are not the first responder.
* kwq/qt/qtextedit.h:
* kwq/KWQTextEdit.mm: (QTextEdit::setFont): Call -[KWQTextArea setFont:].
(QTextEdit::focusPolicy): Always return TabFocus, because the top level widget
is not an NSControl so QWidget::focusPolicy does not suffice.
* kwq/qt/qwidget.h: Make focusPolicy virtual.
* kwq/qt/qfont.h:
* kwq/KWQFont.mm: (QFont::getNSFont): Add this helper function
so we don't have to repeat this in multiple places.
* kwq/KWQLineEdit.mm: (QLineEdit::setFont): Use QFont::getNSFont.
* force-clean-timestamp: For you poor bastards who aren't using the new
Project Builder yet.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1940 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 8a9dec3..71fd751 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,53 @@
2002-08-30 Darin Adler <darin at apple.com>
+ - fixed 3027407 -- Console error refers to closed bug
+
+ * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::bridgeForFrameName):
+ Update bug number from 2959902 to 2942073.
+
+ - fixed 3027532 -- can't tab into or out of textareas
+
+ * kwq/KWQTextArea.h: Add setFont:.
+ * kwq/KWQTextArea.mm:
+ (-[KWQTextArea _createTextView]): Make a KWQTextAreaTextView.
+ (-[KWQTextArea textDidChange:]): Send text changed messages when the text
+ is changed, not when done editing. I did this for KWQNSTextField a while ago;
+ it's tragic that AppKit leads us to have two separate classes for these nearly
+ identical purposes.
+ (-[KWQTextArea setFont:]): Call setFont on the text view.
+ (-[KWQTextArea becomeFirstResponder]): Call makeFirstResponder on the text view.
+ (-[KWQTextArea nextKeyView]): Do that voodoo, just like KWQNSTextField.
+ (-[KWQTextArea previousKeyView]): Ditto.
+ (-[KWQTextArea nextValidKeyView]): Ditto.
+ (-[KWQTextArea previousValidKeyView]): Ditto.
+ (-[KWQTextAreaTextView insertTab:]): Select the next key view. We don't get this
+ automatically because this is not a field editor. But being a field editor leads
+ to other unwanted behavior.
+ (-[KWQTextAreaTextView insertBacktab:]): Ditto.
+ (-[KWQTextAreaTextView becomeFirstResponder]): Select all on entry.
+ (-[KWQTextAreaTextView shouldDrawInsertionPoint]): Don't draw insertion point
+ when we are not the first responder.
+ (-[KWQTextAreaTextView selectedTextAttributes]): Don't draw the selection when
+ we are not the first responder.
+
+ * kwq/qt/qtextedit.h:
+ * kwq/KWQTextEdit.mm: (QTextEdit::setFont): Call -[KWQTextArea setFont:].
+ (QTextEdit::focusPolicy): Always return TabFocus, because the top level widget
+ is not an NSControl so QWidget::focusPolicy does not suffice.
+
+ * kwq/qt/qwidget.h: Make focusPolicy virtual.
+
+ * kwq/qt/qfont.h:
+ * kwq/KWQFont.mm: (QFont::getNSFont): Add this helper function
+ so we don't have to repeat this in multiple places.
+
+ * kwq/KWQLineEdit.mm: (QLineEdit::setFont): Use QFont::getNSFont.
+
+ * force-clean-timestamp: For you poor bastards who aren't using the new
+ Project Builder yet.
+
+2002-08-30 Darin Adler <darin at apple.com>
+
* WebCore.pbproj/project.pbxproj: Allowed the new Project Builder to put in
encodings for each file.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8a9dec3..71fd751 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,53 @@
2002-08-30 Darin Adler <darin at apple.com>
+ - fixed 3027407 -- Console error refers to closed bug
+
+ * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::bridgeForFrameName):
+ Update bug number from 2959902 to 2942073.
+
+ - fixed 3027532 -- can't tab into or out of textareas
+
+ * kwq/KWQTextArea.h: Add setFont:.
+ * kwq/KWQTextArea.mm:
+ (-[KWQTextArea _createTextView]): Make a KWQTextAreaTextView.
+ (-[KWQTextArea textDidChange:]): Send text changed messages when the text
+ is changed, not when done editing. I did this for KWQNSTextField a while ago;
+ it's tragic that AppKit leads us to have two separate classes for these nearly
+ identical purposes.
+ (-[KWQTextArea setFont:]): Call setFont on the text view.
+ (-[KWQTextArea becomeFirstResponder]): Call makeFirstResponder on the text view.
+ (-[KWQTextArea nextKeyView]): Do that voodoo, just like KWQNSTextField.
+ (-[KWQTextArea previousKeyView]): Ditto.
+ (-[KWQTextArea nextValidKeyView]): Ditto.
+ (-[KWQTextArea previousValidKeyView]): Ditto.
+ (-[KWQTextAreaTextView insertTab:]): Select the next key view. We don't get this
+ automatically because this is not a field editor. But being a field editor leads
+ to other unwanted behavior.
+ (-[KWQTextAreaTextView insertBacktab:]): Ditto.
+ (-[KWQTextAreaTextView becomeFirstResponder]): Select all on entry.
+ (-[KWQTextAreaTextView shouldDrawInsertionPoint]): Don't draw insertion point
+ when we are not the first responder.
+ (-[KWQTextAreaTextView selectedTextAttributes]): Don't draw the selection when
+ we are not the first responder.
+
+ * kwq/qt/qtextedit.h:
+ * kwq/KWQTextEdit.mm: (QTextEdit::setFont): Call -[KWQTextArea setFont:].
+ (QTextEdit::focusPolicy): Always return TabFocus, because the top level widget
+ is not an NSControl so QWidget::focusPolicy does not suffice.
+
+ * kwq/qt/qwidget.h: Make focusPolicy virtual.
+
+ * kwq/qt/qfont.h:
+ * kwq/KWQFont.mm: (QFont::getNSFont): Add this helper function
+ so we don't have to repeat this in multiple places.
+
+ * kwq/KWQLineEdit.mm: (QLineEdit::setFont): Use QFont::getNSFont.
+
+ * force-clean-timestamp: For you poor bastards who aren't using the new
+ Project Builder yet.
+
+2002-08-30 Darin Adler <darin at apple.com>
+
* WebCore.pbproj/project.pbxproj: Allowed the new Project Builder to put in
encodings for each file.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8a9dec3..71fd751 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,53 @@
2002-08-30 Darin Adler <darin at apple.com>
+ - fixed 3027407 -- Console error refers to closed bug
+
+ * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::bridgeForFrameName):
+ Update bug number from 2959902 to 2942073.
+
+ - fixed 3027532 -- can't tab into or out of textareas
+
+ * kwq/KWQTextArea.h: Add setFont:.
+ * kwq/KWQTextArea.mm:
+ (-[KWQTextArea _createTextView]): Make a KWQTextAreaTextView.
+ (-[KWQTextArea textDidChange:]): Send text changed messages when the text
+ is changed, not when done editing. I did this for KWQNSTextField a while ago;
+ it's tragic that AppKit leads us to have two separate classes for these nearly
+ identical purposes.
+ (-[KWQTextArea setFont:]): Call setFont on the text view.
+ (-[KWQTextArea becomeFirstResponder]): Call makeFirstResponder on the text view.
+ (-[KWQTextArea nextKeyView]): Do that voodoo, just like KWQNSTextField.
+ (-[KWQTextArea previousKeyView]): Ditto.
+ (-[KWQTextArea nextValidKeyView]): Ditto.
+ (-[KWQTextArea previousValidKeyView]): Ditto.
+ (-[KWQTextAreaTextView insertTab:]): Select the next key view. We don't get this
+ automatically because this is not a field editor. But being a field editor leads
+ to other unwanted behavior.
+ (-[KWQTextAreaTextView insertBacktab:]): Ditto.
+ (-[KWQTextAreaTextView becomeFirstResponder]): Select all on entry.
+ (-[KWQTextAreaTextView shouldDrawInsertionPoint]): Don't draw insertion point
+ when we are not the first responder.
+ (-[KWQTextAreaTextView selectedTextAttributes]): Don't draw the selection when
+ we are not the first responder.
+
+ * kwq/qt/qtextedit.h:
+ * kwq/KWQTextEdit.mm: (QTextEdit::setFont): Call -[KWQTextArea setFont:].
+ (QTextEdit::focusPolicy): Always return TabFocus, because the top level widget
+ is not an NSControl so QWidget::focusPolicy does not suffice.
+
+ * kwq/qt/qwidget.h: Make focusPolicy virtual.
+
+ * kwq/qt/qfont.h:
+ * kwq/KWQFont.mm: (QFont::getNSFont): Add this helper function
+ so we don't have to repeat this in multiple places.
+
+ * kwq/KWQLineEdit.mm: (QLineEdit::setFont): Use QFont::getNSFont.
+
+ * force-clean-timestamp: For you poor bastards who aren't using the new
+ Project Builder yet.
+
+2002-08-30 Darin Adler <darin at apple.com>
+
* WebCore.pbproj/project.pbxproj: Allowed the new Project Builder to put in
encodings for each file.
diff --git a/WebCore/force-clean-timestamp b/WebCore/force-clean-timestamp
index d6f74cf..dc3262d 100644
--- a/WebCore/force-clean-timestamp
+++ b/WebCore/force-clean-timestamp
@@ -1,2 +1 @@
-KHTML change 8/29
-
+QTextEdit virtual function change 8/30
diff --git a/WebCore/kwq/KWQFont.h b/WebCore/kwq/KWQFont.h
index 162bd9e..e7dab03 100644
--- a/WebCore/kwq/KWQFont.h
+++ b/WebCore/kwq/KWQFont.h
@@ -29,8 +29,10 @@
class QString;
#ifdef __OBJC__
+ at class NSFont;
@class NSString;
#else
+class NSFont;
class NSString;
#endif
@@ -59,6 +61,8 @@ public:
NSString *getNSFamily() const { return _family; }
int getNSTraits() const { return _trait; }
float getNSSize() const { return _size; }
+
+ NSFont *getNSFont() const;
private:
NSString *_family;
diff --git a/WebCore/kwq/KWQFont.mm b/WebCore/kwq/KWQFont.mm
index 60676f3..bc74fb4 100644
--- a/WebCore/kwq/KWQFont.mm
+++ b/WebCore/kwq/KWQFont.mm
@@ -27,6 +27,7 @@
#import <qstring.h>
#import <Cocoa/Cocoa.h>
+#import <WebCoreTextRendererFactory.h>
QFont::QFont()
: _family(@"")
@@ -95,3 +96,11 @@ bool QFont::operator==(const QFont &compareFont) const
&& _trait == compareFont._trait
&& _size == compareFont._size;
}
+
+NSFont *QFont::getNSFont() const
+{
+ return [[WebCoreTextRendererFactory sharedFactory]
+ fontWithFamily:getNSFamily()
+ traits:getNSTraits()
+ size:getNSSize()];
+}
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 6bd3e6a..5a94c49 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -127,7 +127,7 @@ WebCoreBridge *KWQKHTMLPartImpl::bridgeForFrameName(const QString &frameName)
} else {
frame = [_bridge descendantFrameNamed:frameName.getNSString()];
if (frame == nil) {
- NSLog (@"WARNING: unable to find frame named %@, creating new window with \"_blank\" name. New window will not be named until 2959902 is fixed.\n", frameName.getNSString());
+ NSLog (@"WARNING: unable to find frame named %@, creating new window with \"_blank\" name. New window will not be named until 2942073 is fixed.\n", frameName.getNSString());
frame = [_bridge descendantFrameNamed:@"_blank"];
}
}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 6bd3e6a..5a94c49 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -127,7 +127,7 @@ WebCoreBridge *KWQKHTMLPartImpl::bridgeForFrameName(const QString &frameName)
} else {
frame = [_bridge descendantFrameNamed:frameName.getNSString()];
if (frame == nil) {
- NSLog (@"WARNING: unable to find frame named %@, creating new window with \"_blank\" name. New window will not be named until 2959902 is fixed.\n", frameName.getNSString());
+ NSLog (@"WARNING: unable to find frame named %@, creating new window with \"_blank\" name. New window will not be named until 2942073 is fixed.\n", frameName.getNSString());
frame = [_bridge descendantFrameNamed:@"_blank"];
}
}
diff --git a/WebCore/kwq/KWQLineEdit.mm b/WebCore/kwq/KWQLineEdit.mm
index 4e2eeda..704c6da 100644
--- a/WebCore/kwq/KWQLineEdit.mm
+++ b/WebCore/kwq/KWQLineEdit.mm
@@ -62,10 +62,7 @@ void QLineEdit::setFont(const QFont &font)
{
QWidget::setFont(font);
KWQNSTextField *textField = (KWQNSTextField *)getView();
- [textField setFont:[[WebCoreTextRendererFactory sharedFactory]
- fontWithFamily:font.getNSFamily()
- traits:font.getNSTraits()
- size:font.getNSSize()]];
+ [textField setFont:font.getNSFont()];
}
void QLineEdit::setText(const QString &s)
diff --git a/WebCore/kwq/KWQTextArea.h b/WebCore/kwq/KWQTextArea.h
index 062da15..dcf56ed 100644
--- a/WebCore/kwq/KWQTextArea.h
+++ b/WebCore/kwq/KWQTextArea.h
@@ -25,13 +25,15 @@
#import <Cocoa/Cocoa.h>
+ at class KWQTextAreaTextView;
class QTextEdit;
@interface KWQTextArea : NSScrollView
{
- NSTextView *textView;
+ KWQTextAreaTextView *textView;
QTextEdit *widget;
BOOL wrap;
+ BOOL inNextValidKeyView;
}
- initWithQTextEdit:(QTextEdit *)w;
@@ -39,13 +41,14 @@ class QTextEdit;
// The following methods corresponds to methods required by KDE.
- (void)setWordWrap:(BOOL)wrap;
- (BOOL)wordWrap;
-- (void)setText:(NSString *)s;
+- (void)setText:(NSString *)text;
- (NSString *)text;
- (int)numLines;
- (NSString *)textForLine:(int)line;
- (void)selectAll;
- (void)setEditable:(BOOL)flag;
- (BOOL)isEditable;
+- (void)setFont:(NSFont *)font;
// paragraph-oriented functions for the benefit of QTextEdit
- (int)paragraphs;
diff --git a/WebCore/kwq/KWQTextArea.mm b/WebCore/kwq/KWQTextArea.mm
index e285685..422ff0c 100644
--- a/WebCore/kwq/KWQTextArea.mm
+++ b/WebCore/kwq/KWQTextArea.mm
@@ -26,6 +26,7 @@
#import <KWQTextArea.h>
#import <qtextedit.h>
+#import <KWQKHTMLPartImpl.h>
/*
This widget is used to implement the <TEXTAREA> element.
@@ -48,6 +49,11 @@
to construct the text with inserted \n.
*/
+ at interface KWQTextAreaTextView : NSTextView
+{
+}
+ at end
+
@implementation KWQTextArea
const float LargeNumberForText = 1.0e7;
@@ -68,7 +74,7 @@ const float LargeNumberForText = 1.0e7;
textFrame.size.height = LargeNumberForText;
}
- textView = [[NSTextView alloc] initWithFrame:textFrame];
+ textView = [[KWQTextAreaTextView alloc] initWithFrame:textFrame];
[[textView textContainer] setWidthTracksTextView:YES];
[textView setRichText:NO];
@@ -112,7 +118,7 @@ const float LargeNumberForText = 1.0e7;
[super dealloc];
}
-- (void)textDidEndEditing:(NSNotification *)aNotification
+- (void)textDidChange:(NSNotification *)aNotification
{
widget->textChanged();
}
@@ -191,7 +197,7 @@ const float LargeNumberForText = 1.0e7;
return @"";
}
-- (int) numLines
+- (int)numLines
{
NSRange glyphRange = NSMakeRange(0,0);
NSLayoutManager *layoutManager = [textView layoutManager];
@@ -353,7 +359,6 @@ static NSRange RangeOfParagraph(NSString *text, int paragraph)
- (void)getCursorPositionAsIndex:(int *)index inParagraph:(int *)paragraph
{
- // FIXME: is this right? Cocoa text view docs are impenetrable
NSString *text = [textView string];
NSRange selectedRange = [textView selectedRange];
@@ -365,7 +370,6 @@ static NSRange RangeOfParagraph(NSString *text, int paragraph)
int i;
NSRange range;
- // this loop will
for (i = 0; i < num; i++) {
range = RangeOfParagraph(text, i);
if (range.location + range.length > selectedRange.location) {
@@ -380,7 +384,6 @@ static NSRange RangeOfParagraph(NSString *text, int paragraph)
- (void)setCursorPositionToIndex:(int)index inParagraph:(int)paragraph
{
- // FIXME: is this right? Cocoa text view docs are impenetrable
NSString *text = [textView string];
NSRange range = RangeOfParagraph(text, paragraph);
if (range.location == NSNotFound) {
@@ -390,4 +393,82 @@ static NSRange RangeOfParagraph(NSString *text, int paragraph)
}
}
+- (void)setFont:(NSFont *)font
+{
+ [textView setFont:font];
+}
+
+- (BOOL)becomeFirstResponder
+{
+ [[self window] makeFirstResponder:textView];
+ return YES;
+}
+
+- (NSView *)nextKeyView
+{
+ return inNextValidKeyView
+ ? KWQKHTMLPartImpl::nextKeyViewForWidget(widget, KWQSelectingNext)
+ : [super nextKeyView];
+}
+
+- (NSView *)previousKeyView
+{
+ return inNextValidKeyView
+ ? KWQKHTMLPartImpl::nextKeyViewForWidget(widget, KWQSelectingPrevious)
+ : [super previousKeyView];
+}
+
+- (NSView *)nextValidKeyView
+{
+ inNextValidKeyView = YES;
+ NSView *view = [super nextValidKeyView];
+ inNextValidKeyView = NO;
+ return view;
+}
+
+- (NSView *)previousValidKeyView
+{
+ inNextValidKeyView = YES;
+ NSView *view = [super previousValidKeyView];
+ inNextValidKeyView = NO;
+ return view;
+}
+
+ at end
+
+ at implementation KWQTextAreaTextView
+
+- (void)insertTab:(id)sender
+{
+ NSView *view = [[self delegate] nextValidKeyView];
+ if (view && view != self && view != [self delegate]) {
+ [[self window] makeFirstResponder:view];
+ }
+}
+
+- (void)insertBacktab:(id)sender
+{
+ NSView *view = [[self delegate] previousValidKeyView];
+ if (view && view != self && view != [self delegate]) {
+ [[self window] makeFirstResponder:view];
+ }
+}
+
+- (BOOL)becomeFirstResponder
+{
+ [super becomeFirstResponder];
+ [self selectAll:nil];
+ return YES;
+}
+
+- (BOOL)shouldDrawInsertionPoint
+{
+ return self == [[self window] firstResponder] && [super shouldDrawInsertionPoint];
+}
+
+- (NSDictionary *)selectedTextAttributes
+{
+ return self == [[self window] firstResponder] ? [super selectedTextAttributes] : nil;
+}
+
@end
diff --git a/WebCore/kwq/KWQTextEdit.h b/WebCore/kwq/KWQTextEdit.h
index 54d7066..6a3096e 100644
--- a/WebCore/kwq/KWQTextEdit.h
+++ b/WebCore/kwq/KWQTextEdit.h
@@ -68,6 +68,10 @@ class QTextEdit : public QScrollView
void textChanged() { m_textChanged.call(); }
+ FocusPolicy focusPolicy() const;
+
+ void setFont(const QFont &);
+
private:
KWQSignal m_textChanged;
};
diff --git a/WebCore/kwq/KWQTextEdit.mm b/WebCore/kwq/KWQTextEdit.mm
index 3dc4299..ad0fb9b 100644
--- a/WebCore/kwq/KWQTextEdit.mm
+++ b/WebCore/kwq/KWQTextEdit.mm
@@ -132,3 +132,15 @@ int QTextEdit::horizontalScrollBarHeight() const
KWQTextArea *textView = (KWQTextArea *)getView();
return (int)[[textView horizontalScroller] frame].size.height;
}
+
+void QTextEdit::setFont(const QFont &font)
+{
+ QWidget::setFont(font);
+ KWQTextArea *textView = (KWQTextArea *)getView();
+ [textView setFont:font.getNSFont()];
+}
+
+QWidget::FocusPolicy QTextEdit::focusPolicy() const
+{
+ return TabFocus;
+}
diff --git a/WebCore/kwq/KWQWidget.h b/WebCore/kwq/KWQWidget.h
index 62f2322..3c6e548 100644
--- a/WebCore/kwq/KWQWidget.h
+++ b/WebCore/kwq/KWQWidget.h
@@ -99,9 +99,11 @@ public:
virtual void setFocus();
virtual void clearFocus();
- FocusPolicy focusPolicy() const;
+
+ virtual FocusPolicy focusPolicy() const;
virtual void setFocusPolicy(FocusPolicy);
- virtual void setFocusProxy( QWidget * );
+
+ virtual void setFocusProxy(QWidget *);
const QPalette& palette() const;
virtual void setPalette(const QPalette &);
diff --git a/WebCore/kwq/qt/qfont.h b/WebCore/kwq/qt/qfont.h
index 162bd9e..e7dab03 100644
--- a/WebCore/kwq/qt/qfont.h
+++ b/WebCore/kwq/qt/qfont.h
@@ -29,8 +29,10 @@
class QString;
#ifdef __OBJC__
+ at class NSFont;
@class NSString;
#else
+class NSFont;
class NSString;
#endif
@@ -59,6 +61,8 @@ public:
NSString *getNSFamily() const { return _family; }
int getNSTraits() const { return _trait; }
float getNSSize() const { return _size; }
+
+ NSFont *getNSFont() const;
private:
NSString *_family;
diff --git a/WebCore/kwq/qt/qtextedit.h b/WebCore/kwq/qt/qtextedit.h
index 54d7066..6a3096e 100644
--- a/WebCore/kwq/qt/qtextedit.h
+++ b/WebCore/kwq/qt/qtextedit.h
@@ -68,6 +68,10 @@ class QTextEdit : public QScrollView
void textChanged() { m_textChanged.call(); }
+ FocusPolicy focusPolicy() const;
+
+ void setFont(const QFont &);
+
private:
KWQSignal m_textChanged;
};
diff --git a/WebCore/kwq/qt/qwidget.h b/WebCore/kwq/qt/qwidget.h
index 62f2322..3c6e548 100644
--- a/WebCore/kwq/qt/qwidget.h
+++ b/WebCore/kwq/qt/qwidget.h
@@ -99,9 +99,11 @@ public:
virtual void setFocus();
virtual void clearFocus();
- FocusPolicy focusPolicy() const;
+
+ virtual FocusPolicy focusPolicy() const;
virtual void setFocusPolicy(FocusPolicy);
- virtual void setFocusProxy( QWidget * );
+
+ virtual void setFocusProxy(QWidget *);
const QPalette& palette() const;
virtual void setPalette(const QPalette &);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list