From fe7ac49c42d7f02f9c8b44d8a73df5f176a016f7 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Sat, 24 Jul 2010 00:54:10 +0000
Subject: [PATCH] MGR:  if Event Log was open, show it _behind_ main window
 when "opening" Manager after it was hidden

svn path=/trunk/boinc/; revision=22055
---
 checkin_notes                | 8 ++++++++
 clientgui/BOINCBaseFrame.cpp | 5 +++--
 clientgui/BOINCGUIApp.cpp    | 2 ++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 9b65e95a2e..75610a0d39 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5595,3 +5595,11 @@ Rom    23 July 2010
         DlgEventLog.cpp
         MainDocument.cpp, .h
         NoticeListCtrl.cpp
+
+Charlie 23 Jul 2010
+    - MGR: I had it backwards: if Event Log was open, show it behind main 
+        window when "opening" Manager after it was hidden.
+
+    clientgui/
+        BOINCBaseFrame.cpp
+        BOINCGUIApp.cpp
diff --git a/clientgui/BOINCBaseFrame.cpp b/clientgui/BOINCBaseFrame.cpp
index 08160de151..6d07cdb476 100644
--- a/clientgui/BOINCBaseFrame.cpp
+++ b/clientgui/BOINCBaseFrame.cpp
@@ -793,12 +793,13 @@ bool CBOINCBaseFrame::Show(bool bShow) {
         }
     }
     
-    retval = wxFrame::Show(bShow);
-    
     CDlgEventLog*   eventLog = wxGetApp().GetEventLog();
     if (eventLog) {
         eventLog->Show(bShow);
     }
+
+    retval = wxFrame::Show(bShow);
+    wxFrame::Raise();
     return retval;
 }
 
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index bb945f7e23..87929150ae 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -461,7 +461,9 @@ bool CBOINCGUIApp::OnInit() {
     
     if(bOpenEventLog) {
         DisplayEventLog(m_bGUIVisible);
+        m_pFrame->Raise();
     }
+    
     return true;
 }