diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 9d0e7f743c..ff7cf9da65 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -2392,6 +2392,17 @@
 #   endif
 #endif /* wxUSE_RICHTEXT */
 
+#if wxUSE_RICHTOOLTIP
+#   if !wxUSE_POPUPWIN
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxRichToolTip requires wxUSE_POPUPWIN"
+#       else
+#           undef wxUSE_POPUPWIN
+#           define wxUSE_POPUPWIN 1
+#       endif
+#   endif
+#endif /* wxUSE_RICHTOOLTIP */
+
 #if wxUSE_PROPGRID
 #   if !wxUSE_VARIANT
 #       ifdef wxABORT_ON_CONFIG_ERROR
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index eeeb4f3793..2e5be999d9 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -3696,6 +3696,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
             }
             break;
 
+#if wxUSE_POPUPWIN
         case WM_NCACTIVATE:
             // When we're losing activation to our own popup window, we want to
             // retain the "active" appearance of the title bar, as dropping
@@ -3712,6 +3713,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
                 processed = true;
             }
             break;
+#endif
 
 #if wxUSE_UXTHEME
         // If we want the default themed border then we need to draw it ourselves
diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index 6940a74028..2adfead2a6 100644
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -2161,7 +2161,7 @@ PRectangle Window::GetMonitorRect(Point pt) {
     #ifdef __WXMSW__
 
         // Use ShowWithoutActivating instead of show.
-        bool wxSTCPopupBase::Show(bool show) wxOVERRIDE
+        bool wxSTCPopupBase::Show(bool show)
         {
             if ( show )
             {
@@ -2179,7 +2179,7 @@ PRectangle Window::GetMonitorRect(Point pt) {
 
         // Do not activate in response to mouse clicks on this window.
         bool wxSTCPopupBase::MSWHandleMessage(WXLRESULT *res, WXUINT msg,
-                                              WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE
+                                              WXWPARAM wParam, WXLPARAM lParam)
         {
             if ( msg == WM_MOUSEACTIVATE )
             {