From 527896ca4c35894e2798105ed73f4c0f784b40dc Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Mon, 16 Jun 2014 18:58:55 -0700
Subject: [PATCH] Win compile fixes

---
 client/cs_notice.cpp                  | 2 +-
 clientgui/sg_ProjectCommandPopup.cpp  | 4 ++--
 clientgui/sg_ProjectWebSitesPopup.cpp | 4 ++--
 clientgui/sg_TaskCommandPopup.cpp     | 4 ++--
 lib/notice.cpp                        | 1 +
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/client/cs_notice.cpp b/client/cs_notice.cpp
index 04395b34f4..226cc5aa01 100644
--- a/client/cs_notice.cpp
+++ b/client/cs_notice.cpp
@@ -504,7 +504,7 @@ void NOTICES::remove_notices(PROJECT* p, int which) {
             remove = !strcmp(n.description.c_str(), NO_WORK_MSG);
             break;
         case REMOVE_CONFIG_MSG:
-            remove = strstr(n.description.c_str(), "cc_config.xml");
+            remove = (strstr(n.description.c_str(), "cc_config.xml") != NULL);
             break;
         }
         if (remove) {
diff --git a/clientgui/sg_ProjectCommandPopup.cpp b/clientgui/sg_ProjectCommandPopup.cpp
index a0b17e27a7..82225ff830 100644
--- a/clientgui/sg_ProjectCommandPopup.cpp
+++ b/clientgui/sg_ProjectCommandPopup.cpp
@@ -99,12 +99,12 @@ void CSimpleProjectCommandPopupButton::AddMenuItems() {
 }
 
 
-void CSimpleProjectCommandPopupButton::OnProjectCommandsMouseDown(wxMouseEvent& event) {
+void CSimpleProjectCommandPopupButton::OnProjectCommandsMouseDown(wxMouseEvent&) {
     ShowProjectCommandsMenu(ScreenToClient(wxGetMousePosition()));
 }
 
 
-void CSimpleProjectCommandPopupButton::OnProjectCommandsKeyboardNav(wxCommandEvent& event) {
+void CSimpleProjectCommandPopupButton::OnProjectCommandsKeyboardNav(wxCommandEvent&) {
     ShowProjectCommandsMenu(wxPoint(GetSize().GetWidth()/2, GetSize().GetHeight()/2));
 }
 
diff --git a/clientgui/sg_ProjectWebSitesPopup.cpp b/clientgui/sg_ProjectWebSitesPopup.cpp
index 168db165ed..5b22e116e5 100644
--- a/clientgui/sg_ProjectWebSitesPopup.cpp
+++ b/clientgui/sg_ProjectWebSitesPopup.cpp
@@ -93,12 +93,12 @@ void CSimpleProjectWebSitesPopupButton::RebuildMenu() {
 }
 
 
-void CSimpleProjectWebSitesPopupButton::OnProjectWebSitesMouseDown(wxMouseEvent& event) {
+void CSimpleProjectWebSitesPopupButton::OnProjectWebSitesMouseDown(wxMouseEvent&) {
     ShowProjectWebSitesMenu(ScreenToClient(wxGetMousePosition()));
 }
 
 
-void CSimpleProjectWebSitesPopupButton::OnProjectWebSitesKeyboardNav(wxCommandEvent& event) {
+void CSimpleProjectWebSitesPopupButton::OnProjectWebSitesKeyboardNav(wxCommandEvent&) {
     ShowProjectWebSitesMenu(wxPoint(GetSize().GetWidth()/2, GetSize().GetHeight()/2));
 }
 
diff --git a/clientgui/sg_TaskCommandPopup.cpp b/clientgui/sg_TaskCommandPopup.cpp
index cdc82c01cd..66022ffcc6 100644
--- a/clientgui/sg_TaskCommandPopup.cpp
+++ b/clientgui/sg_TaskCommandPopup.cpp
@@ -87,12 +87,12 @@ void CSimpleTaskPopupButton::AddMenuItems() {
 }
 
 
-void CSimpleTaskPopupButton::OnTaskCommandsMouseDown(wxMouseEvent& event) {
+void CSimpleTaskPopupButton::OnTaskCommandsMouseDown(wxMouseEvent&) {
     ShowTaskCommandsMenu(ScreenToClient(wxGetMousePosition()));
 }
 
 
-void CSimpleTaskPopupButton::OnTaskCommandsKeyboardNav(wxCommandEvent& event) {
+void CSimpleTaskPopupButton::OnTaskCommandsKeyboardNav(wxCommandEvent&) {
     ShowTaskCommandsMenu(wxPoint(GetSize().GetWidth()/2, GetSize().GetHeight()/2));
 }
 
diff --git a/lib/notice.cpp b/lib/notice.cpp
index 3657b62916..5f907e9d5b 100644
--- a/lib/notice.cpp
+++ b/lib/notice.cpp
@@ -22,6 +22,7 @@
 #endif
 
 #include "error_numbers.h"
+#include "str_replace.h"
 
 #include "notice.h"