[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 f3055b2096890a1f4123670ce13ebcab33e2f8ab
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 13 10:32:14 2002 +0000

    	* kwq/KWQWidget.mm: (QWidget::setCursor):  restored code
    	* kwq/external.h:   removed definitions no longer needed
    	* khtml/rendering/render_form.cpp: (RenderLineEdit::calcMinMaxWidth): tweaked size
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1344 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index c3e839f..c0e677c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-06-13  Richard Williamson  <rjw at apple.com>
+
+    
+	* kwq/KWQWidget.mm: (QWidget::setCursor):  restored code
+	* kwq/external.h:   removed definitions no longer needed
+	* khtml/rendering/render_form.cpp: (RenderLineEdit::calcMinMaxWidth): tweaked size
+
 2002-06-12  Kenneth Kocienda  <kocienda at apple.com>
 
 	* kwq/kwqdebug.h: Made assertion failure console message bolder and easier to see.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c3e839f..c0e677c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-06-13  Richard Williamson  <rjw at apple.com>
+
+    
+	* kwq/KWQWidget.mm: (QWidget::setCursor):  restored code
+	* kwq/external.h:   removed definitions no longer needed
+	* khtml/rendering/render_form.cpp: (RenderLineEdit::calcMinMaxWidth): tweaked size
+
 2002-06-12  Kenneth Kocienda  <kocienda at apple.com>
 
 	* kwq/kwqdebug.h: Made assertion failure console message bolder and easier to see.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c3e839f..c0e677c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-06-13  Richard Williamson  <rjw at apple.com>
+
+    
+	* kwq/KWQWidget.mm: (QWidget::setCursor):  restored code
+	* kwq/external.h:   removed definitions no longer needed
+	* khtml/rendering/render_form.cpp: (RenderLineEdit::calcMinMaxWidth): tweaked size
+
 2002-06-12  Kenneth Kocienda  <kocienda at apple.com>
 
 	* kwq/kwqdebug.h: Made assertion failure console message bolder and easier to see.
diff --git a/WebCore/khtml/rendering/render_form.cpp b/WebCore/khtml/rendering/render_form.cpp
index 0343a37..f2e5464 100644
--- a/WebCore/khtml/rendering/render_form.cpp
+++ b/WebCore/khtml/rendering/render_form.cpp
@@ -542,7 +542,7 @@ void RenderLineEdit::calcMinMaxWidth()
         s = QSize( w + 8, h ).expandedTo( QApplication::globalStrut() );
     } else
 #ifdef APPLE_CHANGES
-	s = QSize( w + 6, h + 6 ).expandedTo( QApplication::globalStrut() );
+	s = QSize( w + 6, h + 4 );
 #else
 	s = QSize( w + 4, h + 4 ).expandedTo( QApplication::globalStrut() );
 #endif
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index 717dbd0..56e4bee 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -25,28 +25,16 @@
 
 #include <qwidget.h>
 
+#include <external.h>
+
 #include <kwqdebug.h>
 
 #import <KWQView.h>
 
 /*
     A QWidget rougly corresponds to an NSView.  In Qt a QFrame and QMainWindow inherit
-    from a QWidget.  In Cocoa a NSWindow does not inherit from NSView.  We will
+    from a QWidget.  In Cocoa a NSWindow does not inherit from NSView.  We
     emulate QWidgets using NSViews.
-    
-    The only QWidget emulated should be KHTMLView.  It's inheritance graph is
-        KHTMLView
-            QScrollView
-                QFrame
-                    QWidget
-    
-    We may not need to emulate any of the QScrollView behaviour as we MAY
-    get scrolling behaviour for free simply be implementing all rendering 
-    in an NSView and using NSScrollView.
-    
-    It appears that the only dependence of the window in khtml and kjs is
-    the javascript functions that manipulate a window.  We may want to
-    rework work that code rather than add NSWindow glue code.
 */
 
 
@@ -281,12 +269,10 @@ void QWidget::setCursor(const QCursor &cur)
 {
     data->cursor = cur;
     
-#if 0
     id view = data->view;
     if ([view respondsToSelector:@selector(setCursor:)]) { 
-	[view setCursor:data->cursor.handle()];
+        [view setCursor:data->cursor.handle()];
     }
-#endif
 }
 
 QCursor QWidget::cursor()
diff --git a/WebCore/kwq/external.h b/WebCore/kwq/external.h
index f6d6037..618ade0 100644
--- a/WebCore/kwq/external.h
+++ b/WebCore/kwq/external.h
@@ -64,7 +64,6 @@ namespace khtml {
 
 @interface IFWebDataSource : NSObject
 - initWithURL: (NSURL *)url;
-- (void)setFrame: (IFWebFrame *)fName;
 - (IFWebFrame *)webFrame;
 - (IFWebController *)controller;
 - frameNamed: (NSString *)f;
@@ -86,6 +85,10 @@ namespace khtml {
 - (KHTMLPart *)part;
 @end
 
+ at interface IFDynamicScrollBarsView
+- (void)setCursor:(NSCursor *)cur;
+ at end
+
 @interface IFWebView: NSObject
 - (QWidget *)_widget;
 - (QWidget *)_provisionalWidget;

-- 
WebKit Debian packaging