[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 b9653b293ee30a7a6db8cbe9f4c6a82092964c38
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 9 22:12:09 2001 +0000

    Temporary fix to support desktop dimension.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@429 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQApplication.mm b/WebCore/kwq/KWQApplication.mm
index 67619bb..6e2711a 100644
--- a/WebCore/kwq/KWQApplication.mm
+++ b/WebCore/kwq/KWQApplication.mm
@@ -39,10 +39,12 @@ QPalette QApplication::palette(const QWidget *p)
 }
 
 
+static QWidget *mainWidget = 0;
+
 QWidget *QApplication::desktop()
 {
-    _logNotYetImplemented();
-    return 0;
+    // FIXME!  This should return a widget that represents the geometry of the desktop.
+    return mainWidget;
 }
 
 
@@ -134,6 +136,8 @@ void QApplication::setMainWidget(QWidget *w)
         return;
     }
     
+    mainWidget = w;
+    
     NSScrollView *sv = [[NSScrollView alloc] initWithFrame: NSMakeRect (0,0,b.size.width,b.size.height)];
     [sv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
     [sv setHasVerticalScroller: YES];
diff --git a/WebCore/src/kwq/KWQApplication.mm b/WebCore/src/kwq/KWQApplication.mm
index 67619bb..6e2711a 100644
--- a/WebCore/src/kwq/KWQApplication.mm
+++ b/WebCore/src/kwq/KWQApplication.mm
@@ -39,10 +39,12 @@ QPalette QApplication::palette(const QWidget *p)
 }
 
 
+static QWidget *mainWidget = 0;
+
 QWidget *QApplication::desktop()
 {
-    _logNotYetImplemented();
-    return 0;
+    // FIXME!  This should return a widget that represents the geometry of the desktop.
+    return mainWidget;
 }
 
 
@@ -134,6 +136,8 @@ void QApplication::setMainWidget(QWidget *w)
         return;
     }
     
+    mainWidget = w;
+    
     NSScrollView *sv = [[NSScrollView alloc] initWithFrame: NSMakeRect (0,0,b.size.width,b.size.height)];
     [sv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
     [sv setHasVerticalScroller: YES];

-- 
WebKit Debian packaging