X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b720b24da89b6b60dbabde36f2a995357e3b1497..a8cb1a4947bbbf5e18ce52448f4c3bb4cff4daee:/src/os2/statbox.cpp

diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index 998c4d9dd3..ef75d915d0 100644
--- a/src/os2/statbox.cpp
+++ b/src/os2/statbox.cpp
@@ -39,9 +39,7 @@ bool wxStaticBox::Create(
                       ,rPos
                       ,rSize
                       ,lStyle
-#if wxUSE_VALIDATORS
                       ,wxDefaultValidator
-#endif
                       ,rsName
                      ))
     {
@@ -51,7 +49,7 @@ bool wxStaticBox::Create(
     wxPoint                         vPos(0,0);
     wxSize                          vSize(0,0);
 
-    if (!OS2CreateControl( "STATIC"
+    if (!OS2CreateControl( wxT("STATIC")
                           ,SS_GROUPBOX
                           ,vPos
                           ,vSize
@@ -68,7 +66,7 @@ bool wxStaticBox::Create(
 
     wxColour                        vColour;
 
-    vColour.Set(wxString("BLACK"));
+    vColour.Set(wxString(wxT("BLACK")));
 
     LONG                            lColor = (LONG)vColour.GetPixel();
 
@@ -99,14 +97,11 @@ wxSize wxStaticBox::DoGetBestSize() const
     int                             nCy;
     int                             wBox;
 
-    wxGetCharSize( GetHWND()
-                  ,&nCx
-                  ,&nCy
-                  ,(wxFont*)&GetFont()
-                 );
+    nCx = GetCharWidth();
+    nCy = GetCharHeight();
     GetTextExtent( wxGetWindowText(m_hWnd)
                   ,&wBox
-                  ,&nCy
+                  ,NULL
                  );
     wBox += 3 * nCx;