Merge remote-tracking branch 'mrcarlberg/binding_support_popup_button' into binding_support_popup_button

Conflicts:
	AppKit/CPPopUpButton.j
This commit is contained in:
cacaodev committed 2012-07-06 22:30:12 +02:00
commit 6a1e5840b5
1 file changed
+1 -1
+1 -1
View File
@@ -861,7 +861,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
}
}
if (![self infoForBinding:CPContentValuesBinding])
if (![_source infoForBinding:CPContentValuesBinding])
{
if (insertNull)
[[_source itemAtIndex:0] setTitle:[_source _getNullPlaceholderFromOptions:options]];