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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 96aa4a10982c667d21442d3ca38eab5ba86fb689
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 9 00:03:37 2004 +0000

            Reviewed by Vicki.
    
            - our part of fix to <rdar://problem/3629334>: (REGRESSION (Tiger): titles on pop-ups menus are truncated and show ellipses)
    
            * kwq/KWQComboBox.mm: (QComboBox::QComboBox): Call setLineBreakMode:NSLineBreakByClipping.
            In the current version of Tiger I am using, this is not implemented yet.
    
            - a couple of other unrelated changes
    
            * khtml/rendering/render_form.cpp: (RenderTextArea::calcMinMaxWidth): Put a little more code
            inside the APPLE_CHANGES ifdef.
            * kwq/KWQTextEdit.h: Remove unused setTabStopWidth function, and make empty setTextFormat
            function an inline for slightly smaller code size.
            * kwq/KWQTextEdit.mm: Ditto.
            * kwq/KWQTextField.mm: Update copyright date.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6796 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 70ff7e1..2aa3a65 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2004-06-08  Darin Adler  <darin at apple.com>
+
+        Reviewed by Vicki.
+
+        - our part of fix to <rdar://problem/3629334>: (REGRESSION (Tiger): titles on pop-ups menus are truncated and show ellipses)
+
+        * kwq/KWQComboBox.mm: (QComboBox::QComboBox): Call setLineBreakMode:NSLineBreakByClipping.
+        In the current version of Tiger I am using, this is not implemented yet.
+
+        - a couple of other unrelated changes
+
+        * khtml/rendering/render_form.cpp: (RenderTextArea::calcMinMaxWidth): Put a little more code
+        inside the APPLE_CHANGES ifdef.
+        * kwq/KWQTextEdit.h: Remove unused setTabStopWidth function, and make empty setTextFormat
+        function an inline for slightly smaller code size.
+        * kwq/KWQTextEdit.mm: Ditto.
+        * kwq/KWQTextField.mm: Update copyright date.
+
 2004-06-08  Trey Matteson  <trey at apple.com>
 
 	A DHTML drag source can now change the dragging image during the drag.  Currently
diff --git a/WebCore/khtml/rendering/render_form.cpp b/WebCore/khtml/rendering/render_form.cpp
index 300777e..a9a0953 100644
--- a/WebCore/khtml/rendering/render_form.cpp
+++ b/WebCore/khtml/rendering/render_form.cpp
@@ -1519,11 +1519,11 @@ void RenderTextArea::calcMinMaxWidth()
     KHTMLAssert( !minMaxKnown() );
 
     TextAreaWidget* w = static_cast<TextAreaWidget*>(m_widget);
-    const QFontMetrics &m = style()->fontMetrics();
-    w->setTabStopWidth(8 * m.width(" "));
 #if APPLE_CHANGES
     QSize size(w->sizeWithColumnsAndRows(QMAX(element()->cols(), 1), QMAX(element()->rows(), 1)));
 #else
+    const QFontMetrics &m = style()->fontMetrics();
+    w->setTabStopWidth(8 * m.width(" "));
     QSize size( QMAX(element()->cols(), 1)*m.width('x') + w->frameWidth() +
                 w->verticalScrollBar()->sizeHint().width(),
                 QMAX(element()->rows(), 1)*m.height() + w->frameWidth()*2 +
diff --git a/WebCore/kwq/KWQComboBox.mm b/WebCore/kwq/KWQComboBox.mm
index f5ae61b..f7e81f6 100644
--- a/WebCore/kwq/KWQComboBox.mm
+++ b/WebCore/kwq/KWQComboBox.mm
@@ -82,6 +82,11 @@ QComboBox::QComboBox()
     [button release];
     
     KWQPopUpButtonCell *cell = [[KWQPopUpButtonCell alloc] initWithQComboBox:this];
+#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_3
+    // Work around problem where the pop-up menu gets a "..." in it
+    // by turning off the default "ellipsizing" behavior.
+    [cell setLineBreakMode:NSLineBreakByClipping];
+#endif
     [button setCell:cell];
     [cell release];
 
diff --git a/WebCore/kwq/KWQTextEdit.h b/WebCore/kwq/KWQTextEdit.h
index 3368355..37cde4a 100644
--- a/WebCore/kwq/KWQTextEdit.h
+++ b/WebCore/kwq/KWQTextEdit.h
@@ -61,13 +61,11 @@ class QTextEdit : public QScrollView
     QString text() const;
     QString textWithHardLineBreaks() const;
 
-    void setTextFormat(TextFormat);
+    void setTextFormat(TextFormat) { }
 
     void setWordWrap(WrapStyle);
     WrapStyle wordWrap() const;
 
-    void setTabStopWidth(int);
-
     void setWritingDirection(QPainter::TextDirection);
     
     void selectAll();
diff --git a/WebCore/kwq/KWQTextEdit.mm b/WebCore/kwq/KWQTextEdit.mm
index a26afbe..da88078 100644
--- a/WebCore/kwq/KWQTextEdit.mm
+++ b/WebCore/kwq/KWQTextEdit.mm
@@ -104,7 +104,6 @@ QTextEdit::WrapStyle QTextEdit::wordWrap() const
     return NoWrap;
 }
 
-
 void QTextEdit::setWordWrap(WrapStyle style)
 {
     KWQTextArea *textView = (KWQTextArea *)getView();
@@ -113,14 +112,6 @@ void QTextEdit::setWordWrap(WrapStyle style)
     KWQ_UNBLOCK_EXCEPTIONS;
 }
 
-void QTextEdit::setTextFormat(TextFormat)
-{
-}
-
-void QTextEdit::setTabStopWidth(int)
-{
-}
-
 bool QTextEdit::isReadOnly() const
 {
     KWQTextArea *textView = (KWQTextArea *)getView();
diff --git a/WebCore/kwq/KWQTextField.mm b/WebCore/kwq/KWQTextField.mm
index 47b1478..65b84d1 100644
--- a/WebCore/kwq/KWQTextField.mm
+++ b/WebCore/kwq/KWQTextField.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2004 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

-- 
WebKit Debian packaging