diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 7468fca53a..3add2b3c6a 100644
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -1118,8 +1118,8 @@ public:
 
     int      GetBatchCount() { return m_batchCount; }
 
-    virtual void Refresh(bool eraseb = true,
-                         const wxRect* rect = (const wxRect *)  NULL); 
+    virtual void Refresh(bool eraseb = TRUE,
+                         const wxRect* rect = (const wxRect *)  NULL);
 
     // Use this, rather than wxWindow::Refresh(), to force an
     // immediate repainting of the grid. Has no effect if you are
diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp
index 44ec4f166a..52a762c252 100644
--- a/src/common/ipcbase.cpp
+++ b/src/common/ipcbase.cpp
@@ -31,23 +31,23 @@ IMPLEMENT_CLASS(wxClientBase, wxObject)
 IMPLEMENT_CLASS(wxConnectionBase, wxObject)
 
 wxConnectionBase::wxConnectionBase(wxChar *buffer, int size)
-    : m_connected(true),
-      m_buffer(buffer), 
+    : m_connected(TRUE),
+      m_buffer(buffer),
       m_buffersize(size),
-      m_deletebufferwhendone(false)
+      m_deletebufferwhendone(FALSE)
 {
   if ( buffer == (wxChar *)NULL )
   { // behave like next constructor
     m_buffersize = 0;
-    m_deletebufferwhendone = true;
+    m_deletebufferwhendone = TRUE;
   }
 }
 
 wxConnectionBase::wxConnectionBase()
-    : m_connected(true),
+    : m_connected(TRUE),
       m_buffer(NULL),
       m_buffersize(0),
-      m_deletebufferwhendone(true)
+      m_deletebufferwhendone(TRUE)
 {
 }
 
@@ -55,7 +55,7 @@ wxConnectionBase::wxConnectionBase(wxConnectionBase& copy)
     : m_connected(copy.m_connected),
       m_buffer(copy.m_buffer),
       m_buffersize(copy.m_buffersize),
-      m_deletebufferwhendone(false)
+      m_deletebufferwhendone(FALSE)
 
 {
   // copy constructor would require ref-counted pointer to buffer
diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index 49e69e22b3..4151df7172 100644
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -383,7 +383,7 @@ bool wxTCPConnection::Disconnect ()
   m_codeco->Write8(IPC_DISCONNECT);
   m_sock->Notify(FALSE);
   m_sock->Close();
-  SetConnected(false);
+  SetConnected(FALSE);
 
   return TRUE;
 }
@@ -660,7 +660,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)
   {
     sock->Notify(FALSE);
     sock->Close();
-    connection->SetConnected(false);
+    connection->SetConnected(FALSE);
     connection->OnDisconnect();
     break;
   }