[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 85521099b4659dba7b9c4d6819908007d1173f1c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 21 21:02:35 2002 +0000

    	Fix for two problems with password fields.
    
    	   1) Return wasn't working.
     	   2) They were wrapping instead of scrolling.
    
            * kwq/KWQNSTextField.mm:
            (-[KWQNSTextField setUpTextField:]): Shared initialization, needed by both
    	the text field and the secure field. This includes the two things we needed
    	for the password text field; wiring up action properly and setScrollable:YES.
            (-[KWQNSTextField initWithFrame:]): Use setUpTextField.
    	(-[KWQNSTextField setPasswordMode:]): Use setUpTextField.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1892 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a450630..d66a2da 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-08-21  Darin Adler  <darin at apple.com>
+
+	Fix for two problems with password fields.
+
+	   1) Return wasn't working.
+ 	   2) They were wrapping instead of scrolling.
+
+        * kwq/KWQNSTextField.mm: 
+        (-[KWQNSTextField setUpTextField:]): Shared initialization, needed by both
+	the text field and the secure field. This includes the two things we needed
+	for the password text field; wiring up action properly and setScrollable:YES.
+        (-[KWQNSTextField initWithFrame:]): Use setUpTextField.
+	(-[KWQNSTextField setPasswordMode:]): Use setUpTextField.
+
 2002-08-21  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3015372, tables and blocks nested inside other tables
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a450630..d66a2da 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2002-08-21  Darin Adler  <darin at apple.com>
+
+	Fix for two problems with password fields.
+
+	   1) Return wasn't working.
+ 	   2) They were wrapping instead of scrolling.
+
+        * kwq/KWQNSTextField.mm: 
+        (-[KWQNSTextField setUpTextField:]): Shared initialization, needed by both
+	the text field and the secure field. This includes the two things we needed
+	for the password text field; wiring up action properly and setScrollable:YES.
+        (-[KWQNSTextField initWithFrame:]): Use setUpTextField.
+	(-[KWQNSTextField setPasswordMode:]): Use setUpTextField.
+
 2002-08-21  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3015372, tables and blocks nested inside other tables
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a450630..d66a2da 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2002-08-21  Darin Adler  <darin at apple.com>
+
+	Fix for two problems with password fields.
+
+	   1) Return wasn't working.
+ 	   2) They were wrapping instead of scrolling.
+
+        * kwq/KWQNSTextField.mm: 
+        (-[KWQNSTextField setUpTextField:]): Shared initialization, needed by both
+	the text field and the secure field. This includes the two things we needed
+	for the password text field; wiring up action properly and setScrollable:YES.
+        (-[KWQNSTextField initWithFrame:]): Use setUpTextField.
+	(-[KWQNSTextField setPasswordMode:]): Use setUpTextField.
+
 2002-08-21  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3015372, tables and blocks nested inside other tables
diff --git a/WebCore/kwq/KWQNSTextField.mm b/WebCore/kwq/KWQNSTextField.mm
index aea56c6..667a98f 100644
--- a/WebCore/kwq/KWQNSTextField.mm
+++ b/WebCore/kwq/KWQNSTextField.mm
@@ -73,20 +73,25 @@
     }
 }
 
-- initWithFrame:(NSRect)frame
+- (void)setUpTextField:(NSTextField *)field
 {
-    [super initWithFrame:frame];
-    
-    formatter = [[KWQTextFieldFormatter alloc] init];
-    [self setFormatter:formatter];
-
-    [self setTarget:self];
-    [self setAction:@selector(action:)];
+    // This is initialization that's shared by both self and the secure text field.
 
-    [self setDelegate:self];
+    [[field cell] setScrollable:YES];
+    
+    [field setFormatter:formatter];
 
-    [[self cell] setScrollable:YES];
+    [field setDelegate:self];
     
+    [field setTarget:self];
+    [field setAction:@selector(action:)];
+}
+
+- initWithFrame:(NSRect)frame
+{
+    [super initWithFrame:frame];
+    formatter = [[KWQTextFieldFormatter alloc] init];
+    [self setUpTextField:self];
     return self;
 }
 
@@ -136,9 +141,9 @@
     } else {
         if (secureField == nil) {
             secureField = [[KWQSecureTextField alloc] initWithQWidget:widget];
-            [secureField setDelegate:self];
             [secureField setFormatter:formatter];
             [secureField setFont:[self font]];
+            [self setUpTextField:secureField];
             [self updateSecureFieldFrame];
         }
         [self addSubview:secureField];
diff --git a/WebCore/kwq/KWQTextField.mm b/WebCore/kwq/KWQTextField.mm
index aea56c6..667a98f 100644
--- a/WebCore/kwq/KWQTextField.mm
+++ b/WebCore/kwq/KWQTextField.mm
@@ -73,20 +73,25 @@
     }
 }
 
-- initWithFrame:(NSRect)frame
+- (void)setUpTextField:(NSTextField *)field
 {
-    [super initWithFrame:frame];
-    
-    formatter = [[KWQTextFieldFormatter alloc] init];
-    [self setFormatter:formatter];
-
-    [self setTarget:self];
-    [self setAction:@selector(action:)];
+    // This is initialization that's shared by both self and the secure text field.
 
-    [self setDelegate:self];
+    [[field cell] setScrollable:YES];
+    
+    [field setFormatter:formatter];
 
-    [[self cell] setScrollable:YES];
+    [field setDelegate:self];
     
+    [field setTarget:self];
+    [field setAction:@selector(action:)];
+}
+
+- initWithFrame:(NSRect)frame
+{
+    [super initWithFrame:frame];
+    formatter = [[KWQTextFieldFormatter alloc] init];
+    [self setUpTextField:self];
     return self;
 }
 
@@ -136,9 +141,9 @@
     } else {
         if (secureField == nil) {
             secureField = [[KWQSecureTextField alloc] initWithQWidget:widget];
-            [secureField setDelegate:self];
             [secureField setFormatter:formatter];
             [secureField setFont:[self font]];
+            [self setUpTextField:secureField];
             [self updateSecureFieldFrame];
         }
         [self addSubview:secureField];

-- 
WebKit Debian packaging