summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Northover <steve>2005-12-22 20:53:26 +0000
committerSteve Northover <steve>2005-12-22 20:53:26 +0000
commit4aacb54bfcdb65562db6ca6951a4263370f3e1cc (patch)
tree394b42455b170c66f3ed179e1c5d3bb3e94cfdb2
parent28d1e64fa65f71715cc3943f67f47c5c5d04734f (diff)
downloadeclipse.platform.swt-4aacb54bfcdb65562db6ca6951a4263370f3e1cc.tar.gz
eclipse.platform.swt-4aacb54bfcdb65562db6ca6951a4263370f3e1cc.tar.xz
eclipse.platform.swt-4aacb54bfcdb65562db6ca6951a4263370f3e1cc.zip
fix formatting, move booleans closer to OS call
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Tree.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Tree.java
index e7a0f3067d..bd41b2dfad 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Tree.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Tree.java
@@ -2280,7 +2280,6 @@ public void removeAll () {
}
items = new TreeItem [4];
childIds = null;
- ignoreExpand = ignoreSelect = true;
/*
* Feature in the Mac. When RemoveDataBrowserItems() is used
* to remove items, item notification callbacks are issued with
@@ -2293,14 +2292,13 @@ public void removeAll () {
callbacks.v1_itemNotificationCallback = 0;
callbacks.v1_itemCompareCallback = 0;
OS.SetDataBrowserCallbacks (handle, callbacks);
+ ignoreExpand = ignoreSelect = true;
int result = OS.RemoveDataBrowserItems (handle, OS.kDataBrowserNoItem, 0, null, 0);
+ ignoreExpand = ignoreSelect = false;
callbacks.v1_itemNotificationCallback = display.itemNotificationProc;
callbacks.v1_itemCompareCallback = display.itemCompareProc;
OS.SetDataBrowserCallbacks (handle, callbacks);
- ignoreExpand = ignoreSelect = false;
- if (result != OS.noErr) {
- error (SWT.ERROR_ITEM_NOT_REMOVED);
- }
+ if (result != OS.noErr) error (SWT.ERROR_ITEM_NOT_REMOVED);
OS.SetDataBrowserScrollPosition (handle, 0, 0);
anchorFirst = anchorLast = 0;
visibleCount = 0;