#include "wx/clipbrd.h"
 #include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-#endif
 
 bool wxComboBox::OS2Command(WXUINT param, WXWORD WXUNUSED(id))
 {
                         int n, const wxString choices[],
                         long style,
 #if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-                        const wxValidator* validator,
-#  else
                         const wxValidator& validator,
-#  endif
 #endif
                         const wxString& name)
 {