avoid undefined behavior from token paste resulting in more than one token

[wxWidgets.git] / src / common / valtext.cpp

diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp
index 202e8195fab7b5c0f24c248166fba76cafc33661..8c69b0692be75eb86e2778bd72956ea8555999ee 100644 (file)
--- a/src/common/valtext.cpp
+++ b/src/common/valtext.cpp
@@ -33,10 +33,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef __SALFORDC__
-    #include <clib.h>
-#endif
-
 IMPLEMENT_DYNAMIC_CLASS(wxTextValidator, wxValidator)
 
 BEGIN_EVENT_TABLE(wxTextValidator, wxValidator)
@@ -85,15 +81,12 @@ wxTextEntry *wxTextValidator::GetTextEntry()
     }
 #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")