[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit d70e5c04a90ddbc9f703dddd8ee829c9fd9e8524
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 9 22:12:47 2001 +0000

    Fixed sizeHint().
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@430 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQComboBox.mm b/WebCore/kwq/KWQComboBox.mm
index 9a3d9e0..9c624b0 100644
--- a/WebCore/kwq/KWQComboBox.mm
+++ b/WebCore/kwq/KWQComboBox.mm
@@ -95,6 +95,17 @@ void QComboBox::insertItem(const QString &text, int index)
 }
 
 
+QSize QComboBox::sizeHint() const 
+{
+    KWQNSComboBox *comboBox = (KWQNSComboBox *)getView();
+    
+    [comboBox sizeToFit];
+    
+    NSRect vFrame = [comboBox frame];
+    return QSize((int)vFrame.size.width,(int)vFrame.size.height);
+}
+
+
 void QComboBox::clear()
 {
     KWQNSComboBox *comboBox = (KWQNSComboBox *)getView();
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index e528e29..eaa7378 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -109,7 +109,8 @@ QWidget::~QWidget()
 
 QSize QWidget::sizeHint() const 
 {
-    _logNeverImplemented();
+    // May be overriden by subclasses.
+    return QSize(0,0);
 }
 
 void QWidget::resize(int w, int h) 
@@ -475,12 +476,14 @@ void QWidget::erase()
 QWidget *QWidget::focusWidget() const
 {
     _logNeverImplemented();
+    return 0;
 }
 
 
 QPoint QWidget::mapFromGlobal(const QPoint &) const
 {
     _logNeverImplemented();
+    return QPoint(0,0);
 }
 
 
diff --git a/WebCore/src/kwq/KWQComboBox.mm b/WebCore/src/kwq/KWQComboBox.mm
index 9a3d9e0..9c624b0 100644
--- a/WebCore/src/kwq/KWQComboBox.mm
+++ b/WebCore/src/kwq/KWQComboBox.mm
@@ -95,6 +95,17 @@ void QComboBox::insertItem(const QString &text, int index)
 }
 
 
+QSize QComboBox::sizeHint() const 
+{
+    KWQNSComboBox *comboBox = (KWQNSComboBox *)getView();
+    
+    [comboBox sizeToFit];
+    
+    NSRect vFrame = [comboBox frame];
+    return QSize((int)vFrame.size.width,(int)vFrame.size.height);
+}
+
+
 void QComboBox::clear()
 {
     KWQNSComboBox *comboBox = (KWQNSComboBox *)getView();
diff --git a/WebCore/src/kwq/KWQWidget.mm b/WebCore/src/kwq/KWQWidget.mm
index e528e29..eaa7378 100644
--- a/WebCore/src/kwq/KWQWidget.mm
+++ b/WebCore/src/kwq/KWQWidget.mm
@@ -109,7 +109,8 @@ QWidget::~QWidget()
 
 QSize QWidget::sizeHint() const 
 {
-    _logNeverImplemented();
+    // May be overriden by subclasses.
+    return QSize(0,0);
 }
 
 void QWidget::resize(int w, int h) 
@@ -475,12 +476,14 @@ void QWidget::erase()
 QWidget *QWidget::focusWidget() const
 {
     _logNeverImplemented();
+    return 0;
 }
 
 
 QPoint QWidget::mapFromGlobal(const QPoint &) const
 {
     _logNeverImplemented();
+    return QPoint(0,0);
 }
 
 

-- 
WebKit Debian packaging