--- android/Calculator/src/dk/thoerup/calculator/CalculatorActivity.java	2010/06/28 12:35:35	939
+++ android/Calculator/src/dk/thoerup/calculator/CalculatorActivity.java	2010/06/28 14:12:41	940
@@ -14,7 +14,9 @@
 		Multiplication,
 		Division,
 		Sqr,
-		Sqrt
+		Sqrt,
+		Pow,
+		Mroot
 	}
 	
 	
@@ -49,6 +51,8 @@
         findViewById(R.id.btnsub).setOnClickListener( new OperationClick(Ops.Subtraction) );
         findViewById(R.id.btnmul).setOnClickListener( new OperationClick(Ops.Multiplication) );
         findViewById(R.id.btndiv).setOnClickListener( new OperationClick(Ops.Division) );
+        findViewById(R.id.btnpow).setOnClickListener( new OperationClick(Ops.Pow) );
+        findViewById(R.id.btnmroot).setOnClickListener( new OperationClick(Ops.Mroot) );
         
         findViewById(R.id.btnsqr).setOnClickListener( new SingleOperationClick(Ops.Sqr) );
         findViewById(R.id.btnsqrt).setOnClickListener( new SingleOperationClick(Ops.Sqrt) );
@@ -195,7 +199,12 @@
 				break;
 			case Division:
 				res = mVal1 / val2;
-				break;				
+				break;
+			case Pow:
+				res = Math.pow(mVal1, val2);
+				break;
+			case Mroot:
+				res = Math.pow(val2, (1.0/mVal1) );
 			}
 			
 			setResult(res);