[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 3ba9e4761714c304b52a1b353474d70655ea3157
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 26 02:50:51 2002 +0000

            Disable the copy menu item when IFHTMLView is key
            and has no selection.
    
            * WebView.subproj/IFHTMLView.mm:
            (-[IFHTMLView validateMenuItem:]):
            Disable menu if selection is empty.
            (-[IFHTMLView copy:]):
            Factored code that gets the bridge.
            * WebView.subproj/IFHTMLViewPrivate.h:
            Added _bridge.
            * WebView.subproj/IFHTMLViewPrivate.mm:
            (-[IFHTMLView _bridge]):
            We need to access the bridge from the view
            to get the part's selection.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1436 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 287d784..b063326 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2002-06-25  Richard Williamson  <rjw at apple.com>
+
+        Disable the copy menu item when IFHTMLView has is key
+        and has no selection.
+        
+        * WebView.subproj/IFHTMLView.mm:
+        (-[IFHTMLView validateMenuItem:]):
+        Disable menu if selection is empty.
+        (-[IFHTMLView copy:]):
+        Factored code that gets the bridge.
+        * WebView.subproj/IFHTMLViewPrivate.h:
+        Added _bridge.
+        * WebView.subproj/IFHTMLViewPrivate.mm:
+        (-[IFHTMLView _bridge]):
+        We need to access the bridge from the view
+        to get the part's selection.
+
 2002-06-25  Chris Blumenberg  <cblu at apple.com>
 
 	Remove downloaded file if cancelled.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 287d784..b063326 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,20 @@
+2002-06-25  Richard Williamson  <rjw at apple.com>
+
+        Disable the copy menu item when IFHTMLView has is key
+        and has no selection.
+        
+        * WebView.subproj/IFHTMLView.mm:
+        (-[IFHTMLView validateMenuItem:]):
+        Disable menu if selection is empty.
+        (-[IFHTMLView copy:]):
+        Factored code that gets the bridge.
+        * WebView.subproj/IFHTMLViewPrivate.h:
+        Added _bridge.
+        * WebView.subproj/IFHTMLViewPrivate.mm:
+        (-[IFHTMLView _bridge]):
+        We need to access the bridge from the view
+        to get the part's selection.
+
 2002-06-25  Chris Blumenberg  <cblu at apple.com>
 
 	Remove downloaded file if cancelled.
diff --git a/WebKit/WebView.subproj/IFHTMLView.mm b/WebKit/WebView.subproj/IFHTMLView.mm
index 363a45a..5ea0d20 100644
--- a/WebKit/WebView.subproj/IFHTMLView.mm
+++ b/WebKit/WebView.subproj/IFHTMLView.mm
@@ -51,11 +51,22 @@
     return self;
 }
 
+
+- (BOOL)validateMenuItem:(NSMenuItem *)item 
+{
+    SEL action = [item action];
+
+    if (action == @selector(copy:)){
+        if ([[[self _bridge] selectedText] length] > 0)
+            return YES;
+    }
+    return NO;
+}
+
+
 - (void)copy:(id)sender
 {
-    IFWebView *webView = [self _IF_parentWebView];
-    IFWebFrame *webFrame = [[webView _controller] frameForView: webView];
-    IFWebCoreBridge *bridge = [[webFrame dataSource] _bridge];
+    IFWebCoreBridge *bridge = [self _bridge];
     NSPasteboard *pboard = [NSPasteboard generalPasteboard];
     
     [pboard declareTypes:[NSArray arrayWithObjects:NSStringPboardType, nil] owner:nil];
diff --git a/WebKit/WebView.subproj/IFHTMLViewPrivate.h b/WebKit/WebView.subproj/IFHTMLViewPrivate.h
index f559517..40b4b17 100644
--- a/WebKit/WebView.subproj/IFHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/IFHTMLViewPrivate.h
@@ -14,6 +14,8 @@ class KHTMLView;
 @class KHTMLView;
 #endif
 
+ at class IFWebCoreBridge;
+
 @interface IFHTMLViewPrivate : NSObject
 {
     IFWebController *controller;
@@ -38,4 +40,5 @@ class KHTMLView;
 - (KHTMLView *)_widget;
 - (KHTMLView *)_provisionalWidget;
 - (void)_takeOwnershipOfWidget;
+- (IFWebCoreBridge *)_bridge;
 @end
diff --git a/WebKit/WebView.subproj/IFHTMLViewPrivate.mm b/WebKit/WebView.subproj/IFHTMLViewPrivate.mm
index 578d736..bb18a2f 100644
--- a/WebKit/WebView.subproj/IFHTMLViewPrivate.mm
+++ b/WebKit/WebView.subproj/IFHTMLViewPrivate.mm
@@ -7,9 +7,14 @@
 */
 #import <WebKit/WebKitDebug.h>
 
-#import <WebKit/IFImageRenderer.h>
 #import <WebKit/IFHTMLViewPrivate.h>
+#import <WebKit/IFImageRenderer.h>
+#import <WebKit/IFNSViewExtras.h>
 #import <WebKit/IFPluginView.h>
+#import <WebKit/IFWebController.h>
+#import <WebKit/IFWebCoreBridge.h>
+#import <WebKit/IFWebFramePrivate.h>
+#import <WebKit/IFWebViewPrivate.h>
 
 // Includes from KDE
 #import <khtmlview.h>
@@ -72,4 +77,12 @@
     _private->widgetOwned = NO;
 }
 
+// Required so view can access the part's selection.
+- (IFWebCoreBridge *)_bridge
+{
+    IFWebView *webView = [self _IF_parentWebView];
+    IFWebFrame *webFrame = [[webView _controller] frameForView: webView];
+    return [[webFrame dataSource] _bridge];
+}
+
 @end
diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 363a45a..5ea0d20 100644
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -51,11 +51,22 @@
     return self;
 }
 
+
+- (BOOL)validateMenuItem:(NSMenuItem *)item 
+{
+    SEL action = [item action];
+
+    if (action == @selector(copy:)){
+        if ([[[self _bridge] selectedText] length] > 0)
+            return YES;
+    }
+    return NO;
+}
+
+
 - (void)copy:(id)sender
 {
-    IFWebView *webView = [self _IF_parentWebView];
-    IFWebFrame *webFrame = [[webView _controller] frameForView: webView];
-    IFWebCoreBridge *bridge = [[webFrame dataSource] _bridge];
+    IFWebCoreBridge *bridge = [self _bridge];
     NSPasteboard *pboard = [NSPasteboard generalPasteboard];
     
     [pboard declareTypes:[NSArray arrayWithObjects:NSStringPboardType, nil] owner:nil];
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.h b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
index f559517..40b4b17 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.h
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.h
@@ -14,6 +14,8 @@ class KHTMLView;
 @class KHTMLView;
 #endif
 
+ at class IFWebCoreBridge;
+
 @interface IFHTMLViewPrivate : NSObject
 {
     IFWebController *controller;
@@ -38,4 +40,5 @@ class KHTMLView;
 - (KHTMLView *)_widget;
 - (KHTMLView *)_provisionalWidget;
 - (void)_takeOwnershipOfWidget;
+- (IFWebCoreBridge *)_bridge;
 @end
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 578d736..bb18a2f 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -7,9 +7,14 @@
 */
 #import <WebKit/WebKitDebug.h>
 
-#import <WebKit/IFImageRenderer.h>
 #import <WebKit/IFHTMLViewPrivate.h>
+#import <WebKit/IFImageRenderer.h>
+#import <WebKit/IFNSViewExtras.h>
 #import <WebKit/IFPluginView.h>
+#import <WebKit/IFWebController.h>
+#import <WebKit/IFWebCoreBridge.h>
+#import <WebKit/IFWebFramePrivate.h>
+#import <WebKit/IFWebViewPrivate.h>
 
 // Includes from KDE
 #import <khtmlview.h>
@@ -72,4 +77,12 @@
     _private->widgetOwned = NO;
 }
 
+// Required so view can access the part's selection.
+- (IFWebCoreBridge *)_bridge
+{
+    IFWebView *webView = [self _IF_parentWebView];
+    IFWebFrame *webFrame = [[webView _controller] frameForView: webView];
+    return [[webFrame dataSource] _bridge];
+}
+
 @end

-- 
WebKit Debian packaging