Skip to content

Commit

Permalink
Merge branch '0.7b' of git@github.com:280north/cappuccino into 0.7b
Browse files Browse the repository at this point in the history
  • Loading branch information
Ross Boucher committed Apr 22, 2009
2 parents f9640fb + 1614855 commit 6401067
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 1 deletion.
2 changes: 1 addition & 1 deletion AppKit/CPSecureTextField.j
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

@import "CPTextField.j"

#include "Platform/Platform.h"

@implementation CPSecureTextField : CPTextField
{
Expand Down
4 changes: 4 additions & 0 deletions AppKit/CPTextField.j
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,10 @@ CPTextFieldStatePlaceholder = 1 << 13;

var secureStringForString = function(aString)
{
// This is true for when aString === "" and null/undefined.
if (!aString)
return "";

var secureString = "",
length = aString.length;

Expand Down
1 change: 1 addition & 0 deletions Tools/nib2cib/NSAppKit.j
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
@import "NSScrollView.j"
@import "NSScroller.j"
@import "NSSet.j"
@import "NSSecureTextField.j"
@import "NSSegmentedControl.j"
@import "NSSlider.j"
@import "NSSplitView.j"
Expand Down
26 changes: 26 additions & 0 deletions Tools/nib2cib/NSSecureTextField.j
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

@import <AppKit/CPSecureTextField.j>

@import "NSTextField.j"


@implementation NSSecureTextField : CPSecureTextField
{
}

- (id)initWithCoder:(CPCoder)aCoder
{
return [self NS_initWithCoder:aCoder];
}

- (Class)classForKeyedArchiver
{
return [CPSecureTextField class];
}

@end

@implementation NSSecureTextFieldCell : NSTextFieldCell
{
}
@end

0 comments on commit 6401067

Please sign in to comment.