From 869aa34aab8d30ab16309921e40171d4d4a42be6 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Sun, 19 Nov 2006 12:18:17 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=11549
---
 checkin_notes                | 6 ++++++
 clientgui/ViewMessages.cpp   | 4 +++-
 clientgui/sg_DlgMessages.cpp | 8 ++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index b6bed146d2..3198843655 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -12690,3 +12690,9 @@ Bruce 19 Nov 2006
     sched/
         file_deleter.C
 
+Charlie 19 Nov 2006
+    - MGR: Fix windows compile errors.
+
+    clientgui/
+        sg_ProjectsComponent.cpp
+        ViewMessages.cpp
diff --git a/clientgui/ViewMessages.cpp b/clientgui/ViewMessages.cpp
index e1f3d56693..4157134fd8 100644
--- a/clientgui/ViewMessages.cpp
+++ b/clientgui/ViewMessages.cpp
@@ -89,11 +89,13 @@ CViewMessages::CViewMessages(wxNotebook* pNotebook) :
 
 	pItem = new CTaskItem(
         _("Copy selected messages"),
+#ifdef __WXMAC__
         _("Copy the selected messages to the clipboard. "
           "You can select multiple messages by holding down the shift "
- #ifdef __WXMAC__
           "or command key while clicking on messages."),
 #else
+        _("Copy the selected messages to the clipboard. "
+          "You can select multiple messages by holding down the shift "
           "or control key while clicking on messages."),
 #endif
         ID_TASK_MESSAGES_COPYSELECTED 
diff --git a/clientgui/sg_DlgMessages.cpp b/clientgui/sg_DlgMessages.cpp
index 2b51b77644..358a8223c4 100644
--- a/clientgui/sg_DlgMessages.cpp
+++ b/clientgui/sg_DlgMessages.cpp
@@ -180,21 +180,25 @@ void CPanelMessages::CreateControls()
     wxButton* itemButton2 = new wxButton;
     itemButton2->Create(this, ID_COPYSELECTED, _("Copy selected messages"), wxDefaultPosition, wxDefaultSize, 0);
     itemButton2->SetHelpText(
+#ifdef __WXMAC__
         _("Copy the selected messages to the clipboard. "
           "You can select multiple messages by holding down the shift "
-#ifdef __WXMAC__
           "or command key while clicking on messages.")
 #else
+        _("Copy the selected messages to the clipboard. "
+          "You can select multiple messages by holding down the shift "
           "or control key while clicking on messages.")
 #endif
     );
 #if wxUSE_TOOLTIPS
     itemButton2->SetToolTip(
+#ifdef __WXMAC__
         _("Copy the selected messages to the clipboard. "
           "You can select multiple messages by holding down the shift "
-#ifdef __WXMAC__
           "or command key while clicking on messages.")
 #else
+        _("Copy the selected messages to the clipboard. "
+          "You can select multiple messages by holding down the shift "
           "or control key while clicking on messages.")
 #endif
     );