mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-17 04:00:42 +00:00
Merge remote-tracking branch 'mrcarlberg/binding_support_popup_button' into binding_support_popup_button
Conflicts: AppKit/CPPopUpButton.j
This commit is contained in:
commit
6a1e5840b5
1 file changed
+1
-1
@@ -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]];
|
||||
|
||||
Reference in new issue
Block a user