From f93c8d4c6526733bf716fc385430b6f66d3664ba Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Fri, 14 Oct 2011 05:03:48 +0000
Subject: [PATCH]     - MGR: Remove code that blocks the switch to simple view
 when an         accessibility aid is running.

    clientgui/
        BOINCGUIApp.cpp
        AdvancedFrame.cpp

svn path=/trunk/boinc/; revision=24397
---
 checkin_notes               | 8 ++++++++
 clientgui/AdvancedFrame.cpp | 6 ------
 clientgui/BOINCGUIApp.cpp   | 6 ------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index f1f0c11f62..594fa110e7 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -7214,3 +7214,11 @@ David  13 Oct 2011
 
     clientgui/
         sg_TaskPanel.cpp,h
+
+Rom    13 Oct 2011
+    - MGR: Remove code that blocks the switch to simple view when an
+        accessibility aid is running.
+        
+    clientgui/
+        BOINCGUIApp.cpp
+        AdvancedFrame.cpp
diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp
index 683712fc1b..d8b16684ab 100644
--- a/clientgui/AdvancedFrame.cpp
+++ b/clientgui/AdvancedFrame.cpp
@@ -402,12 +402,6 @@ bool CAdvancedFrame::CreateMenu() {
         menuView->Enable(ID_CHANGEGUI, false);
     }
 
-    // Is an accessibility aid running?
-    if (wxGetApp().IsAccessibilityEnabled()) {
-        menuView->Enable(ID_CHANGEGUI, false);
-    }
-
-
     // Tools menu
     wxMenu *menuTools = new wxMenu;
 
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index d528f7b969..dcd8db58f6 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -392,16 +392,10 @@ bool CBOINCGUIApp::OnInit() {
 
     // Is there a condition in which the Simple GUI should not be used?
     if (BOINC_SIMPLEGUI == m_iGUISelected) {
-
         // Screen too small?
         if (wxGetDisplaySize().GetHeight() < 600) {
             m_iGUISelected = BOINC_ADVANCEDGUI;
         }
-
-        // Screen reader in use?
-        if (IsAccessibilityEnabled()) {
-            m_iGUISelected = BOINC_ADVANCEDGUI;
-        }
     }