[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:40:41 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6920c92874e423ede310f8dca5e42b32000c3dd5
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 20 23:45:49 2002 +0000
Some first steps toward implementing input=file.
* khtml/rendering/render_form.cpp:
(RenderFileButton::RenderFileButton): Create a KWQFileButton as the widget.
(RenderFileButton::calcMinMaxWidth): Use sizeHint().
(RenderFileButton::updateFromElement): Call setFilename().
(RenderFileButton::select): Don't try to selectAll() on m_edit.
* kwq/KWQFileButton.h: Added.
* kwq/KWQFileButton.mm: Added.
* kwq/qt/qhbox.h: Emptied.
* kwq/KWQHBox.mm: Removed.
* WebCore.pbproj/project.pbxproj: Removed KWQHBox.mm. Added KWQFileButton.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2108 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 4782339..096148e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,21 @@
2002-09-20 Darin Adler <darin at apple.com>
+ Some first steps toward implementing input=file.
+
+ * khtml/rendering/render_form.cpp:
+ (RenderFileButton::RenderFileButton): Create a KWQFileButton as the widget.
+ (RenderFileButton::calcMinMaxWidth): Use sizeHint().
+ (RenderFileButton::updateFromElement): Call setFilename().
+ (RenderFileButton::select): Don't try to selectAll() on m_edit.
+
+ * kwq/KWQFileButton.h: Added.
+ * kwq/KWQFileButton.mm: Added.
+ * kwq/qt/qhbox.h: Emptied.
+ * kwq/KWQHBox.mm: Removed.
+ * WebCore.pbproj/project.pbxproj: Removed KWQHBox.mm. Added KWQFileButton.
+
+2002-09-20 Darin Adler <darin at apple.com>
+
- fixed 3056605 -- REGRESSION: blank page at http://www.2ch.net/2ch.html
* kwq/mac-encodings.txt: When people say ShiftJIS, they really mean
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4782339..096148e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,21 @@
2002-09-20 Darin Adler <darin at apple.com>
+ Some first steps toward implementing input=file.
+
+ * khtml/rendering/render_form.cpp:
+ (RenderFileButton::RenderFileButton): Create a KWQFileButton as the widget.
+ (RenderFileButton::calcMinMaxWidth): Use sizeHint().
+ (RenderFileButton::updateFromElement): Call setFilename().
+ (RenderFileButton::select): Don't try to selectAll() on m_edit.
+
+ * kwq/KWQFileButton.h: Added.
+ * kwq/KWQFileButton.mm: Added.
+ * kwq/qt/qhbox.h: Emptied.
+ * kwq/KWQHBox.mm: Removed.
+ * WebCore.pbproj/project.pbxproj: Removed KWQHBox.mm. Added KWQFileButton.
+
+2002-09-20 Darin Adler <darin at apple.com>
+
- fixed 3056605 -- REGRESSION: blank page at http://www.2ch.net/2ch.html
* kwq/mac-encodings.txt: When people say ShiftJIS, they really mean
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4782339..096148e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,21 @@
2002-09-20 Darin Adler <darin at apple.com>
+ Some first steps toward implementing input=file.
+
+ * khtml/rendering/render_form.cpp:
+ (RenderFileButton::RenderFileButton): Create a KWQFileButton as the widget.
+ (RenderFileButton::calcMinMaxWidth): Use sizeHint().
+ (RenderFileButton::updateFromElement): Call setFilename().
+ (RenderFileButton::select): Don't try to selectAll() on m_edit.
+
+ * kwq/KWQFileButton.h: Added.
+ * kwq/KWQFileButton.mm: Added.
+ * kwq/qt/qhbox.h: Emptied.
+ * kwq/KWQHBox.mm: Removed.
+ * WebCore.pbproj/project.pbxproj: Removed KWQHBox.mm. Added KWQFileButton.
+
+2002-09-20 Darin Adler <darin at apple.com>
+
- fixed 3056605 -- REGRESSION: blank page at http://www.2ch.net/2ch.html
* kwq/mac-encodings.txt: When people say ShiftJIS, they really mean
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index c8d4ceb..df69e9e 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -308,7 +308,6 @@
F58786DF02DE3B8601EA4122,
F58786E002DE3B8601EA4122,
F58786E102DE3B8601EA4122,
- F58786E202DE3B8601EA4122,
F58786E302DE3B8601EA4122,
F58786E402DE3B8601EA4122,
F58786E502DE3B8601EA4122,
@@ -493,6 +492,8 @@
F690CFEC031C47F401CA2AC4,
9377FB57032C235C008635CE,
93861DE1032C2E52008635CE,
+ 93CCF7D6033BD43C008635CE,
+ 93CCF7E3033BE9C1008635CE,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -536,7 +537,6 @@
F587857602DE375901EA4122,
F587857702DE375901EA4122,
F587857802DE375901EA4122,
- F587857902DE375901EA4122,
F587857A02DE375901EA4122,
F587857D02DE375901EA4122,
F587857F02DE375901EA4122,
@@ -723,6 +723,7 @@
F690CFED031C47F401CA2AC4,
9377FB58032C235C008635CE,
93861DE2032C2E52008635CE,
+ 93CCF7D7033BD43C008635CE,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -885,6 +886,42 @@
settings = {
};
};
+ 93CCF7D4033BD43C008635CE = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = KWQFileButton.h;
+ refType = 4;
+ };
+ 93CCF7D5033BD43C008635CE = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = KWQFileButton.mm;
+ refType = 4;
+ };
+ 93CCF7D6033BD43C008635CE = {
+ fileRef = 93CCF7D4033BD43C008635CE;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 93CCF7D7033BD43C008635CE = {
+ fileRef = 93CCF7D5033BD43C008635CE;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 93CCF7E2033BE9C1008635CE = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = qhbox.h;
+ refType = 4;
+ };
+ 93CCF7E3033BE9C1008635CE = {
+ fileRef = 93CCF7E2033BE9C1008635CE;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
//930
//931
//932
@@ -984,6 +1021,8 @@
F58784DA02DE375901EA4122,
354F248902EE28590ACA2ACA,
354F248A02EE28590ACA2ACA,
+ 93CCF7D4033BD43C008635CE,
+ 93CCF7D5033BD43C008635CE,
F58784EE02DE375901EA4122,
F58784EF02DE375901EA4122,
F58784FA02DE375901EA4122,
@@ -4328,13 +4367,6 @@
path = ../KWQGuardedPtr.mm;
refType = 4;
};
- F58784E702DE375901EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- name = KWQHBox.mm;
- path = ../KWQHBox.mm;
- refType = 4;
- };
F58784E802DE375901EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -5149,12 +5181,6 @@
settings = {
};
};
- F587857902DE375901EA4122 = {
- fileRef = F58784E702DE375901EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F587857A02DE375901EA4122 = {
fileRef = F58784E802DE375901EA4122;
isa = PBXBuildFile;
@@ -6989,12 +7015,6 @@
path = qguardedptr.h;
refType = 4;
};
- F587869102DE3B8601EA4122 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = qhbox.h;
- refType = 4;
- };
F587869202DE3B8601EA4122 = {
fileEncoding = 30;
isa = PBXFileReference;
@@ -7469,12 +7489,6 @@
settings = {
};
};
- F58786E202DE3B8601EA4122 = {
- fileRef = F587869102DE3B8601EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F58786E302DE3B8601EA4122 = {
fileRef = F587869202DE3B8601EA4122;
isa = PBXBuildFile;
@@ -7839,8 +7853,7 @@
F587868F02DE3B8601EA4122,
F587869002DE3B8601EA4122,
F58784E602DE375901EA4122,
- F587869102DE3B8601EA4122,
- F58784E702DE375901EA4122,
+ 93CCF7E2033BE9C1008635CE,
F587869202DE3B8601EA4122,
F587869302DE3B8601EA4122,
F58784E802DE375901EA4122,
diff --git a/WebCore/khtml/rendering/render_form.cpp b/WebCore/khtml/rendering/render_form.cpp
index 96f4d96..c6dc583 100644
--- a/WebCore/khtml/rendering/render_form.cpp
+++ b/WebCore/khtml/rendering/render_form.cpp
@@ -44,6 +44,10 @@
#include <kdebug.h>
+#if APPLE_CHANGES
+#include "KWQFileButton.h"
+#endif
+
using namespace khtml;
RenderFormElement::RenderFormElement(HTMLGenericFormElementImpl *element)
@@ -552,6 +556,11 @@ RenderFieldset::RenderFieldset(HTMLGenericFormElementImpl *element)
RenderFileButton::RenderFileButton(HTMLInputElementImpl *element)
: RenderFormElement(element)
{
+#if APPLE_CHANGES
+ KWQFileButton *w = new KWQFileButton;
+ connect(w, SIGNAL(textChanged(const QString &)),this,SLOT(slotTextChanged(const QString &)));
+ setQWidget(w);
+#else
QHBox *w = new QHBox(view()->viewport());
m_edit = new LineEditWidget(w);
@@ -568,12 +577,17 @@ RenderFileButton::RenderFileButton(HTMLInputElementImpl *element)
setQWidget(w);
m_haveFocus = false;
+#endif
}
void RenderFileButton::calcMinMaxWidth()
{
KHTMLAssert( !minMaxKnown() );
+#if APPLE_CHANGES
+ // Let the widget tell us how big it wants to be.
+ QSize s(widget()->sizeHint());
+#else
const QFontMetrics &fm = style()->fontMetrics();
QSize s;
int size = element()->size();
@@ -584,6 +598,7 @@ void RenderFileButton::calcMinMaxWidth()
s = QSize(w + 2 + 2*m_edit->frameWidth(),
QMAX(h, 14) + 2 + 2*m_edit->frameWidth())
.expandedTo(QApplication::globalStrut());
+#endif
setIntrinsicWidth( s.width() );
setIntrinsicHeight( s.height() );
@@ -610,6 +625,9 @@ void RenderFileButton::slotClicked()
void RenderFileButton::updateFromElement()
{
+#if APPLE_CHANGES
+ static_cast<KWQFileButton *>(widget())->setFilename(element()->value().string());
+#else
m_edit->blockSignals(true);
m_edit->setText(element()->value().string());
m_edit->blockSignals(false);
@@ -618,6 +636,7 @@ void RenderFileButton::updateFromElement()
ml = 1024;
m_edit->setMaxLength( ml );
m_edit->setEdited( false );
+#endif
RenderFormElement::updateFromElement();
}
@@ -635,7 +654,9 @@ void RenderFileButton::slotTextChanged(const QString &string)
void RenderFileButton::select()
{
+#if !APPLE_CHANGES
m_edit->selectAll();
+#endif
}
diff --git a/WebCore/kwq/qt/qcheckbox.h b/WebCore/kwq/KWQFileButton.h
similarity index 72%
copy from WebCore/kwq/qt/qcheckbox.h
copy to WebCore/kwq/KWQFileButton.h
index 0af3f29..34f7ea5 100644
--- a/WebCore/kwq/qt/qcheckbox.h
+++ b/WebCore/kwq/KWQFileButton.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2002 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
@@ -23,26 +23,37 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef QCHECKBOX_H_
-#define QCHECKBOX_H_
+#ifndef KWQFILEBUTTON_H
+#define KWQFILEBUTTON_H
-#include <qbutton.h>
+#include <qpushbutton.h>
-class QCheckBox : public QButton {
-public:
- QCheckBox(QWidget *);
-
- void setChecked(bool);
- bool isChecked();
+#ifdef __OBJC__
+ at class KWQFileButtonAdapter;
+#else
+class KWQFileButtonAdapter;
+#endif
+class KWQFileButton : public QPushButton {
+public:
+ KWQFileButton();
+ ~KWQFileButton();
+
+ void setFilename(const QString &);
+ QString filename() const { return _filename; }
+
QSize sizeHint() const;
QRect frameGeometry() const;
void setFrameGeometry(const QRect &);
-
- virtual void clicked();
+ int baselinePosition() const;
private:
- KWQSignal m_stateChanged;
+ virtual void clicked();
+ virtual void paint();
+
+ KWQSignal _textChanged;
+ QString _filename;
+ KWQFileButtonAdapter *_adapter;
};
#endif
diff --git a/WebCore/kwq/KWQFileButton.mm b/WebCore/kwq/KWQFileButton.mm
new file mode 100644
index 0000000..d41496d
--- /dev/null
+++ b/WebCore/kwq/KWQFileButton.mm
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2002 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 "KWQFileButton.h"
+
+#define BUTTON_FILENAME_SPACING 4
+#define FILENAME_WIDTH 200
+#define FONT_FAMILY ("Lucida Grande")
+
+// FIXME: Clicks on the text should pull up the sheet too.
+
+ at interface KWQFileButtonAdapter : NSObject
+{
+ KWQFileButton *button;
+}
+
+- initWithKWQFileButton:(KWQFileButton *)button;
+- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
+
+ at end
+
+KWQFileButton::KWQFileButton()
+ // FIXME: Needs to be localized.
+ : QPushButton("Choose File", 0)
+ , _textChanged(this, SIGNAL(textChanged(const QString &)))
+ , _adapter([[KWQFileButtonAdapter alloc] initWithKWQFileButton:this])
+{
+}
+
+KWQFileButton::~KWQFileButton()
+{
+ _adapter->button = 0;
+ [_adapter release];
+}
+
+void KWQFileButton::setFilename(const QString &f)
+{
+ if (_filename == f) {
+ return;
+ }
+ _filename = f;
+ _textChanged.call(_filename);
+
+ // Dirty the filename part of the view.
+ QRect r = QPushButton::frameGeometry();
+ r.setX(r.x() + r.width() + BUTTON_FILENAME_SPACING);
+ r.setWidth(FILENAME_WIDTH);
+ [[getView() superview] setNeedsDisplayInRect:frameGeometry()];
+}
+
+void KWQFileButton::clicked()
+{
+ NSOpenPanel *sheet = [NSOpenPanel openPanel];
+
+ [_adapter retain];
+
+ [sheet beginSheetForDirectory:@"" file:@"" types:nil
+ modalForWindow:[getView() window] modalDelegate:_adapter
+ didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:)
+ contextInfo:nil];
+
+ QPushButton::paint();
+}
+
+QSize KWQFileButton::sizeHint() const
+{
+ QSize s = QPushButton::sizeHint();
+ s.setWidth(s.width() + (BUTTON_FILENAME_SPACING + FILENAME_WIDTH));
+ return s;
+}
+
+QRect KWQFileButton::frameGeometry() const
+{
+ QRect r = QPushButton::frameGeometry();
+ r.setWidth(r.width() + (BUTTON_FILENAME_SPACING + FILENAME_WIDTH));
+ return r;
+}
+
+void KWQFileButton::setFrameGeometry(const QRect &rect)
+{
+ QRect r = rect;
+ r.setWidth(r.width() - (BUTTON_FILENAME_SPACING + FILENAME_WIDTH));
+ QPushButton::setFrameGeometry(r);
+}
+
+int KWQFileButton::baselinePosition() const
+{
+ return QPushButton::baselinePosition();
+}
+
+void KWQFileButton::paint()
+{
+ QPushButton::paint();
+
+ QString leafName = _filename;
+ int slashPosition = leafName.findRev('/');
+ if (slashPosition >= 0 || leafName == "/") {
+ leafName.remove(0, slashPosition + 1);
+ }
+
+ // FIXME: Use same font as button, don't hardcode Lucida Grande.
+ // FIXME: Ellipsize the text to fit in the box.
+ QPainter painter;
+ QFont font;
+ font.setFamily(FONT_FAMILY);
+ font.setPixelSize([NSFont smallSystemFontSize]);
+ painter.save(); // wouldn't be needed in real Qt, but we need it
+ painter.addClip(frameGeometry());
+ painter.setFont(font);
+ painter.drawText(x() + width() - FILENAME_WIDTH, y() + baselinePosition(), 0, 0, 0, leafName);
+ painter.restore(); // wouldn't be needed in real Qt, but we need it
+}
+
+ at implementation KWQFileButtonAdapter
+
+- initWithKWQFileButton:(KWQFileButton *)b
+{
+ [super init];
+ button = b;
+ return self;
+}
+
+- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
+{
+ if (button && returnCode == NSOKButton && [[sheet filenames] count] == 1) {
+ button->setFilename(QString::fromNSString([[sheet filenames] objectAtIndex:0]));
+ }
+ [self release];
+}
+
+ at end
diff --git a/WebCore/kwq/KWQHBox.mm b/WebCore/kwq/KWQHBox.mm
deleted file mode 100644
index a60ba19..0000000
--- a/WebCore/kwq/KWQHBox.mm
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2001, 2002 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 <qhbox.h>
-
-#import <KWQView.h>
-
-// This class is ONLY used by FORM <input type=file> elements. It's used
-// to stretch a LineEditWidget. We probably don't need it at all.
-
-QHBox::QHBox(QWidget *parent)
-{
- KWQView *view = (KWQView *)getView();
- [view setIsFlipped: NO];
-}
-
-// Override the focus proxy to add the line edit widget as a subview.
-void QHBox::setFocusProxy(QWidget *lineEdit)
-{
- // Do we also need to set size, or will layout take care of that?
- [getView() addSubview: lineEdit->getView()];
-}
-
-void QHBox::setStretchFactor(QWidget *, int stretch)
-{
-}
diff --git a/WebCore/kwq/qt/qhbox.h b/WebCore/kwq/qt/qhbox.h
index 59d1cd3..e69de29 100644
--- a/WebCore/kwq/qt/qhbox.h
+++ b/WebCore/kwq/qt/qhbox.h
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2001 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.
- */
-
-#ifndef QHBOX_H_
-#define QHBOX_H_
-
-#include <qwidget.h>
-#include <qframe.h>
-
-class QHBox : public QFrame {
-public:
- QHBox(QWidget *);
-
- void setStretchFactor(QWidget*, int stretch);
- void setFocusProxy(QWidget *lineEdit);
-};
-
-#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list