diff --git a/include/wx/odcombo.h b/include/wx/odcombo.h
index d5baadcc36..4411e73d1e 100644
--- a/include/wx/odcombo.h
+++ b/include/wx/odcombo.h
@@ -174,6 +174,13 @@ protected:
     // Stop partial completion (when some other event occurs)
     void StopPartialCompletion();
 
+#ifdef __WXMSW__
+    // Added to work around a SetFocus() log error. Overriding virtual member
+    // function from the primary base class (in this case, wxVListBox) should
+    // be ABI compatible.
+    virtual void SetFocus();
+#endif
+
     wxArrayString           m_strings;
     wxArrayPtrVoid          m_clientDatas;
 
diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index c95b381460..8eaa0c93d2 100644
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -94,6 +94,17 @@ wxVListBoxComboPopup::~wxVListBoxComboPopup()
     Clear();
 }
 
+#ifdef __WXMSW__
+
+void wxVListBoxComboPopup::SetFocus()
+{
+    // Suppress SetFocus() warning by simply not calling it. This combo popup
+    // has already been designed with the assumption that SetFocus() may not
+    // do anything useful, so it really doesn't need to be called.
+}
+
+#endif // __WXMSW__
+
 bool wxVListBoxComboPopup::LazyCreate()
 {
     // NB: There is a bug with wxVListBox that can be avoided by creating