fixed incorrect GetTextExtent for wxTELETYPE font

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

diff --git a/src/os2/radiobox.cpp b/src/os2/radiobox.cpp
index 6048148d4acc4be20e84e81214cfba4049b09c2f..0392b1c87f5fd79301026270626197e8d2bff322 100644 (file)
--- a/src/os2/radiobox.cpp
+++ b/src/os2/radiobox.cpp
@@ -15,6 +15,8 @@
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/setup.h"
+    #include "wx/wxchar.h"
+    #include "wx/string.h"
     #include "wx/bitmap.h"
     #include "wx/brush.h"
     #include "wx/radiobox.h"
@@ -22,9 +24,7 @@
 
 #include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
-#endif
 
 // ---------------------------------------------------------------------------
 // private functions
@@ -143,14 +143,17 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
         const wxPoint& pos, const wxSize& size,
         int n, const wxString choices[],
         int majorDim, long style,
+#if wxUSE_VALIDATORS
         const wxValidator& val, const wxString& name)
+#endif
 {
     m_selectedButton = -1;
     m_noItems = n;
 
     SetName(name);
+#if wxUSE_VALIDATORS
     SetValidator(val);
-
+#endif
     parent->AddChild(this);
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();