added missing return on error

[wxWidgets.git] / src / os2 / combobox.cpp

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index d8b0bd0e6d594563c4ef5cdbce475666c6a27fb0..0a3802cb51e1c401f25c9b0d07962286354c96dd 100644 (file)
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -24,9 +24,7 @@
 #include "wx/clipbrd.h"
 #include "wx/os2/private.h"
 
 #include "wx/clipbrd.h"
 #include "wx/os2/private.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)

-#endif

 
 bool wxComboBox::OS2Command(WXUINT param, WXWORD WXUNUSED(id))
 {
 
 bool wxComboBox::OS2Command(WXUINT param, WXWORD WXUNUSED(id))
 {


@@ -64,11 +62,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                         int n, const wxString choices[],
                         long style,
 #if wxUSE_VALIDATORS
                         int n, const wxString choices[],
                         long style,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-                        const wxValidator* validator,
-#  else

                         const wxValidator& validator,
                         const wxValidator& validator,

-#  endif

 #endif
                         const wxString& name)
 {
 #endif
                         const wxString& name)
 {