diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 0c1eeaba2d..202e8195fa 100644
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -84,12 +84,16 @@ wxTextEntry *wxTextValidator::GetTextEntry()
         return (wxTextCtrl*)m_validatorWindow;
     }
 #endif
+
+    // FIXME: in wxMotif wxComboBox doesn't derive from wxTextCtrl yet
+#ifndef __WXMOTIF__
 #if wxUSE_COMBOBOX
     if (m_validatorWindow->IsKindOf(CLASSINFO(wxComboBox)))
     {
         return (wxComboBox*)m_validatorWindow;
     }
 #endif
+#endif // !__WXMOTIF__
 
     wxFAIL_MSG(
         _T("wxTextValidator can only be used with wxTextCtrl or wxComboBox")