--- a/AbstractSettingsApplication.st	Fri Oct 30 18:02:26 2009 +0100
+++ b/AbstractSettingsApplication.st	Fri Oct 30 19:18:51 2009 +0100
@@ -7001,8 +7001,11 @@
         from:currentUserPrefs.
 
     self shadows value:PopUpView shadows.
-    self lowerOnRightClickInTitle value:(currentScreen rightButtonIsLowerWindow:nil).
-    self lowerOnShiftClickInTitle value:(currentScreen shiftedLeftButtonIsLowerWindow:nil).
+
+    currentScreen platformName = 'WIN32' ifTrue:[   
+        self lowerOnRightClickInTitle value:(currentScreen rightButtonIsLowerWindow:nil).
+        self lowerOnShiftClickInTitle value:(currentScreen shiftedLeftButtonIsLowerWindow:nil).
+    ].
 !
 
 basicSaveSettings
@@ -7027,8 +7030,10 @@
         writeAspects:(self aspectsFromUserPreferences)
         to:currentUserPrefs.
 
-    currentScreen rightButtonIsLowerWindow:(self lowerOnRightClickInTitle value).
-    currentScreen shiftedLeftButtonIsLowerWindow:(self lowerOnShiftClickInTitle value).
+    currentScreen platformName = 'WIN32' ifTrue:[
+        currentScreen rightButtonIsLowerWindow:(self lowerOnRightClickInTitle value).
+        currentScreen shiftedLeftButtonIsLowerWindow:(self lowerOnShiftClickInTitle value).
+    ].
 
     mustReopenTools ifTrue:[
         self reopenToolsAfterChangedViewStyleSetting.
@@ -7110,22 +7115,28 @@
 !AbstractSettingsApplication::MiscDisplay2SettingsAppl methodsFor:'queries'!
 
 hasUnsavedChanges
+     |currentScreen|
+
+     currentScreen := Screen current.
+
      (self
         hasChangedAspectIn:
             #(
                 nativeWidgets
                 nativeDialogs
             )
-        asComparedTo:Screen current) ifTrue:[^ true].
+        asComparedTo:currentScreen) ifTrue:[^ true].
 
      (self
         hasChangedAspectIn:(self aspectsFromUserPreferences)
         asComparedTo:currentUserPrefs) ifTrue:[^ true].
 
     self shadows value ~= PopUpView shadows ifTrue:[^ true].
-    (Screen current rightButtonIsLowerWindow:nil) ~= (self lowerOnRightClickInTitle value) ifTrue:[^ true].
-    (Screen current shiftedLeftButtonIsLowerWindow:nil) ~= (self lowerOnShiftClickInTitle value) ifTrue:[^ true].
-
+
+    currentScreen platformName = 'WIN32' ifTrue:[   
+        (currentScreen rightButtonIsLowerWindow:nil) ~= (self lowerOnRightClickInTitle value) ifTrue:[^ true].
+        (currentScreen shiftedLeftButtonIsLowerWindow:nil) ~= (self lowerOnShiftClickInTitle value) ifTrue:[^ true].
+    ].
     ^ false
 !
 
@@ -15617,9 +15628,9 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.342 2009-10-30 17:02:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.343 2009-10-30 18:18:51 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.342 2009-10-30 17:02:26 cg Exp $'
-! !
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.343 2009-10-30 18:18:51 cg Exp $'
+! !