From a200eb140b12ddfc5ed7b71e4307e4d8047d3d76 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 1 Sep 2006 21:38:18 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=11080
---
 checkin_notes                      | 11 +++++++++++
 client/win/win_screensaver.cpp     |  3 ++-
 clientgui/ViewMessages.cpp         |  2 +-
 clientgui/sg_DlgMessages.cpp       |  3 ++-
 clientgui/sg_ProjectsComponent.cpp |  4 +++-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index e046698c2d..f6d64632cd 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -9704,3 +9704,14 @@ David  1 Sep 2006
         util.C
     sched/
         server_types.h
+
+David  1 Sep 2006
+	- Get things to compile on Win.
+		The above fix seems to work.
+
+	client/win/
+		win_screensaver.cpp
+	clientgui/
+		ViewMessages.cpp
+		sg_DlgMessages.cpp
+		sg_ProjectsComponents.cpp
diff --git a/client/win/win_screensaver.cpp b/client/win/win_screensaver.cpp
index b0f25f96dc..535f538c5e 100755
--- a/client/win/win_screensaver.cpp
+++ b/client/win/win_screensaver.cpp
@@ -34,8 +34,9 @@
 
 #include "boinc_ss.h"
 #include "diagnostics.h"
-#include "win_screensaver.h"
+#include "common_defs.h"
 #include "util.h"
+#include "win_screensaver.h"
 
 #ifdef _DEBUG
 #define UNUSED(x)
diff --git a/clientgui/ViewMessages.cpp b/clientgui/ViewMessages.cpp
index e811107c2b..889370bdba 100644
--- a/clientgui/ViewMessages.cpp
+++ b/clientgui/ViewMessages.cpp
@@ -310,7 +310,7 @@ wxInt32 CViewMessages::FormatPriority(wxInt32 item, wxString& strBuffer) const {
 
     if (message) {
         switch(message->priority) {
-        case MSG_PRIORITY_INFO:
+        case MSG_INFO:
             strBuffer = wxT("I");
             break;
         default:
diff --git a/clientgui/sg_DlgMessages.cpp b/clientgui/sg_DlgMessages.cpp
index d23c8eef0a..ddd7a1c1cf 100644
--- a/clientgui/sg_DlgMessages.cpp
+++ b/clientgui/sg_DlgMessages.cpp
@@ -22,6 +22,7 @@
 #endif
 
 #include "stdwx.h"
+#include "common_defs.h"
 #include "BOINCGUIApp.h"
 #include "sg_DlgMessages.h"
 #include "sg_SGUIListControl.h"
@@ -268,7 +269,7 @@ wxInt32 CDlgMessages::FormatPriority(wxInt32 item, wxString& strBuffer) const {
 
     if (message) {
         switch(message->priority) {
-        case MSG_PRIORITY_INFO:
+        case MSG_INFO:
             strBuffer = wxT("I");
             break;
         default:
diff --git a/clientgui/sg_ProjectsComponent.cpp b/clientgui/sg_ProjectsComponent.cpp
index 877e76cc8f..08738b6455 100644
--- a/clientgui/sg_ProjectsComponent.cpp
+++ b/clientgui/sg_ProjectsComponent.cpp
@@ -548,7 +548,9 @@ void CProjectsComponent::OnBtnClick(wxCommandEvent& event){ //init function
     }else if(m_wxBtnObj==btnPause) {
 		CMainDocument* pDoc     = wxGetApp().GetDocument();
         CC_STATUS      status;
+
         pDoc->GetCoreClientStatus(status);
+
         clientRunMode = status.task_mode;
 		pDoc->SetActivityRunMode(RUN_MODE_NEVER);
 		btnPause->Show(false);
@@ -619,7 +621,7 @@ void CProjectsComponent::CheckForErrorMessages(wxTimerEvent& WXUNUSED(event)) {
 		for(int i=lastMessageId; i < pDoc->messages.messages.size(); i++) {
 			lastMessageId = i+1;
 			message = pDoc->message(i);
-			if ( message != NULL && message->priority == MSG_PRIORITY_ERROR ) {
+			if ( message != NULL && message->priority == MSG_ERROR ) {
 				receivedErrorMessage = true;
 				checkForMessagesTimer->Stop();
 				lastMessageId = pDoc->messages.messages.size();