Renamed textField to textfield in the Mac OS X port for consistency.

6 files changed, 11 insertions, 12 deletions

diff --git a/redo/area_darwin.go b/redo/area_darwin.go
index 83d148e..dc2477f 100644
--- a/redo/area_darwin.go
+++ b/redo/area_darwin.go
@@ -67,13 +67,13 @@ func (a *area) OpenTextFieldAt(x, y int) {
 }
 
 func (a *area) TextFieldText() string {
-	return C.GoString(C.textFieldText(a.textfield))
+	return C.GoString(C.textfieldText(a.textfield))
 }
 
 func (a *area) SetTextFieldText(text string) {
 	ctext := C.CString(text)
 	defer C.free(unsafe.Pointer(ctext))
-	C.textFieldSetText(a.textfield, ctext)
+	C.textfieldSetText(a.textfield, ctext)
 }
 
 func (a *area) OnTextFieldDismissed(f func()) {
diff --git a/redo/basicctrls_darwin.m b/redo/basicctrls_darwin.m
index 57d6b68..8ec7f57 100644
--- a/redo/basicctrls_darwin.m
+++ b/redo/basicctrls_darwin.m
@@ -155,13 +155,13 @@ void textfieldSetDelegate(id textfield, void *t)
 }
 
 // also good for labels
-const char *textFieldText(id t)
+const char *textfieldText(id t)
 {
 	return [[toNSTextField(t) stringValue] UTF8String];
 }
 
 // also good for labels
-void textFieldSetText(id t, char *text)
+void textfieldSetText(id t, char *text)
 {
 	[toNSTextField(t) setStringValue:[NSString stringWithUTF8String:text]];
 }
diff --git a/redo/label_darwin.go b/redo/label_darwin.go
index fab59d9..0508931 100644
--- a/redo/label_darwin.go
+++ b/redo/label_darwin.go
@@ -32,13 +32,13 @@ func newStandaloneLabel(text string) Label {
 }
 
 func (l *label) Text() string {
-	return C.GoString(C.textFieldText(l._id))
+	return C.GoString(C.textfieldText(l._id))
 }
 
 func (l *label) SetText(text string) {
 	ctext := C.CString(text)
 	defer C.free(unsafe.Pointer(ctext))
-	C.textFieldSetText(l._id, ctext)
+	C.textfieldSetText(l._id, ctext)
 }
 
 func (l *label) isStandalone() bool {
diff --git a/redo/objc_darwin.h b/redo/objc_darwin.h
index a961a0e..5fa1557 100644
--- a/redo/objc_darwin.h
+++ b/redo/objc_darwin.h
@@ -71,8 +71,8 @@ extern id finishNewTextField(id, BOOL);
 extern id newTextField(void);
 extern id newPasswordField(void);
 extern void textfieldSetDelegate(id, void *);
-extern const char *textFieldText(id);
-extern void textFieldSetText(id, char *);
+extern const char *textfieldText(id);
+extern void textfieldSetText(id, char *);
 extern id textfieldOpenInvalidPopover(id, char *);
 extern void textfieldCloseInvalidPopover(id);
 extern id newLabel(void);
diff --git a/redo/textfield_darwin.go b/redo/textfield_darwin.go
index 8539f8b..b1242f7 100644
--- a/redo/textfield_darwin.go
+++ b/redo/textfield_darwin.go
@@ -33,13 +33,13 @@ func newPasswordField() *textfield {
 }
 
 func (t *textfield) Text() string {
-	return C.GoString(C.textFieldText(t._id))
+	return C.GoString(C.textfieldText(t._id))
 }
 
 func (t *textfield) SetText(text string) {
 	ctext := C.CString(text)
 	defer C.free(unsafe.Pointer(ctext))
-	C.textFieldSetText(t._id, ctext)
+	C.textfieldSetText(t._id, ctext)
 }
 
 func (t *textfield) OnChanged(f func()) {
diff --git a/redo/warningpopover_darwin.m b/redo/warningpopover_darwin.m
index 40b62f0..f3c9672 100644
--- a/redo/warningpopover_darwin.m
+++ b/redo/warningpopover_darwin.m
@@ -99,8 +99,7 @@ id newWarningPopover(char *text)
 	[wv->icon setRefusesFirstResponder:YES];
 
 	wv->label = (NSTextField *) newLabel();
-	// TODO rename to textfieldSetText
-	textFieldSetText((id) wv->label, text);
+	textfieldSetText((id) wv->label, text);
 	[wv->label setRefusesFirstResponder:YES];
 
 	[wv addSubview:wv->icon];