--- a/WinWorkstation.st	Tue Aug 24 17:23:32 2010 +0200
+++ b/WinWorkstation.st	Wed Aug 25 13:20:36 2010 +0200
@@ -3610,14 +3610,22 @@
 	    break;
 
 	case WM_LBUTTONDBLCLK:
+	    curButton = Button1;
+	    goto commonButtonDown;
 	case WM_MBUTTONDBLCLK:
+	    curButton = Button2;
+	    goto commonButtonDown;
 	case WM_RBUTTONDBLCLK:
+	    curButton = Button3;
+#ifdef PRE_25_AUG_2010
 	    if (isNative) {
-		NDPRINTF(("WM_*BUTTONDBLCLK for native - default handling\n"));
-		return 0;
-	    }
-	    goto commonButtonWithCapture;
-	    // goto commonButton;
+		 NDPRINTF(("WM_*BUTTONDBLCLK for native - default handling\n"));
+		 return 0;
+	    }
+	    goto commonButton;
+#else
+	    goto commonButtonDown;
+#endif /* PRE_25_AUG_2010 */
 
 	case WM_LBUTTONDOWN:
 	    curButton = Button1;
@@ -3627,6 +3635,7 @@
 	    goto commonButtonDown;
 	case WM_RBUTTONDOWN:
 	    curButton = Button3;
+
 	commonButtonDown:
 	    if (isNative) {
 		NDPRINTF(("WM_*BUTTONDOWN for native - default handling\n"));
@@ -15009,25 +15018,25 @@
 
 nativeConfirm:aString title:titleString flags:flags initialAnswer:trueOrFalse
      ^ self
-            nativeMessageBoxFor:nil
-            text:aString asString string
-            title:titleString
-            flags:flags
-            blocking:false
+	    nativeMessageBoxFor:nil
+	    text:aString asString string
+	    title:titleString
+	    flags:flags
+	    blocking:false
 
      "
       Screen current
-        nativeConfirm:'please confirm'
-        title:'Confirm'
-        flags:#( APPLMODAL ICONQUESTION OKCANCEL)
-        initialAnswer:true
+	nativeConfirm:'please confirm'
+	title:'Confirm'
+	flags:#( APPLMODAL ICONQUESTION OKCANCEL)
+	initialAnswer:true
      "
      "
       Screen current
-        nativeConfirm:'Yes or No'
-        title:'Confirm'
-        flags:#( APPLMODAL ICONQUESTION YESNO)
-        initialAnswer:true
+	nativeConfirm:'Yes or No'
+	title:'Confirm'
+	flags:#( APPLMODAL ICONQUESTION YESNO)
+	initialAnswer:true
      "
 
     "Modified: / 02-03-2007 / 15:37:57 / cg"
@@ -18858,11 +18867,11 @@
 !WinWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.433 2010-08-24 15:22:30 sr Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.434 2010-08-25 11:20:36 az Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.433 2010-08-24 15:22:30 sr Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.434 2010-08-25 11:20:36 az Exp $'
 ! !
 
 WinWorkstation initialize!