fixes to version string

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

diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index 6e4dc8074d3ce45d224b10f805e64ddd304d55a7..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))
 {


@@ -63,11 +61,15 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                         const wxSize& size,
                         int n, const wxString choices[],
                         long style,
                         const wxSize& size,
                         int n, const wxString choices[],
                         long style,

+#if wxUSE_VALIDATORS

                         const wxValidator& validator,
                         const wxValidator& validator,

+#endif

                         const wxString& name)
 {
   SetName(name);
                         const wxString& name)
 {
   SetName(name);

+#if wxUSE_VALIDATORS

   SetValidator(validator);
   SetValidator(validator);

+#endif

   if (parent) parent->AddChild(this);
   SetBackgroundColour(parent->GetBackgroundColour()) ;
   SetForegroundColour(parent->GetForegroundColour()) ;
   if (parent) parent->AddChild(this);
   SetBackgroundColour(parent->GetBackgroundColour()) ;
   SetForegroundColour(parent->GetForegroundColour()) ;