From 3d0d724d560ea0d71b33e3d25a97c61a375e737b Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Thu, 9 Jun 2011 09:25:04 +0000
Subject: [PATCH] MGR: Event Log menu item restores Event Log when Minimized

svn path=/trunk/boinc/; revision=23701
---
 checkin_notes                | 20 ++++++++++++++------
 clientgui/BOINCBaseFrame.cpp |  6 ++++++
 clientgui/BOINCGUIApp.cpp    |  3 +++
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 86ec2a26ab..1f5daf569a 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -3409,20 +3409,20 @@ David  7 Jun 2011
     client/
         app_control.cpp
 
-Charlie 7 Jun 2011
+Charlie 8 Jun 2011
     - MGR: Fix About dialog to show (PowerPC) instead of (x86) when appropriate.
     
     clientgui/
         DlgAbout.cpp
 
-Charlie 7 Jun 2011
+Charlie 8 Jun 2011
     - MGR: Rework logic to skip exit confirmation dialog and avoid shutting down 
         client if second instance of Manager is launched, so it works if connect 
         to remote host fails.
-    - MGR: If original instance of Manager is connected to remote host (or none),
-        skip exit confirmation dialog but do shut down local client if requested 
-        in most recently run exit dialog, whether or not "Remember this decision" 
-        was set.
+    - MGR: If original instance of Manager is connected to remote host (or none)
+        when exiting Manager. skip exit confirmation dialog but do shut down local 
+        client if requested in most recently run exit dialog, whether or not 
+        "Remember this decision" was set.
     - MGR: Use same exit confirmation dialog wording for Linux as for Windows.
         
     clientgui/
@@ -3447,3 +3447,11 @@ David  8 Jun 2011
 
     api/
         boinc_api.h
+
+Charlie 9 Jun 2011
+    - MGR: Event Log menu item restores Event Log when Minimized; fixed on Mac 
+        and Windows XP, hopefully on other versions of Windows OS.
+    
+    clientgui/
+        BOINCBaseFrame.cpp
+        BOINCGUIApp.cpp
diff --git a/clientgui/BOINCBaseFrame.cpp b/clientgui/BOINCBaseFrame.cpp
index 1c071f12ed..c5414de2fd 100644
--- a/clientgui/BOINCBaseFrame.cpp
+++ b/clientgui/BOINCBaseFrame.cpp
@@ -869,7 +869,13 @@ bool CBOINCBaseFrame::Show(bool bShow) {
     
     CDlgEventLog*   eventLog = wxGetApp().GetEventLog();
     if (eventLog) {
+#ifdef __WXMAC__
+        if (bShow) {
+            eventLog->Show(bShow);
+        }
+#else
         eventLog->Show(bShow);
+#endif
     }
 
     retval = wxFrame::Show(bShow);
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index f493d05323..e830c662af 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -880,6 +880,9 @@ int CBOINCGUIApp::StartBOINCDefaultScreensaverTest() {
 void CBOINCGUIApp::DisplayEventLog(bool bShowWindow) {
     if (m_pEventLog ) {
         if (bShowWindow) {
+            if (m_pEventLog->IsIconized()) {
+                m_pEventLog->Iconize(false);
+            }
             m_pEventLog->Raise();
         }
     } else {