summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Kriese2010-10-19 02:02:59 (EDT)
committerSteffen Kriese2010-10-19 02:02:59 (EDT)
commitd8c18c1945d243ac89f2539f5e286194ba7ad2fd (patch)
tree8b87fafa88ac0a85e2a1fb9b477238acb23b57e8
parent8a5a89b0b3960a4656903c60751ee0683fccd209 (diff)
downloadorg.eclipse.riena-d8c18c1945d243ac89f2539f5e286194ba7ad2fd.zip
org.eclipse.riena-d8c18c1945d243ac89f2539f5e286194ba7ad2fd.tar.gz
org.eclipse.riena-d8c18c1945d243ac89f2539f5e286194ba7ad2fd.tar.bz2
Fix for CCombo on RAP: RuntimeException
-rw-r--r--org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/ui/ridgets/swt/MarkerSupport.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/ui/ridgets/swt/MarkerSupport.java b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/ui/ridgets/swt/MarkerSupport.java
index e612b3c..5c5424e 100644
--- a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/ui/ridgets/swt/MarkerSupport.java
+++ b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/ui/ridgets/swt/MarkerSupport.java
@@ -34,6 +34,7 @@ import org.eclipse.swt.widgets.Display;
import org.eclipse.riena.core.Log4r;
import org.eclipse.riena.core.marker.IMarker;
import org.eclipse.riena.core.util.Nop;
+import org.eclipse.riena.core.util.RAPDetector;
import org.eclipse.riena.core.util.ReflectionUtils;
import org.eclipse.riena.internal.ui.ridgets.swt.Activator;
import org.eclipse.riena.internal.ui.ridgets.swt.SharedColors;
@@ -189,7 +190,7 @@ public class MarkerSupport extends BasicMarkerSupport {
private Color getControlBackground(final Control control) {
// a CCombo does return the background of the composite instead of the list we use
- if (control instanceof CCombo) {
+ if (control instanceof CCombo && !RAPDetector.isRAPavailable()) {
try {
final Control txt = ReflectionUtils.getHidden(control, "list"); //$NON-NLS-1$
return txt.getBackground();