update from Tsolakos Stavros

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

diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index 571107c39b62da91c86177053e0ba1b5bd048d49..470c2380e974811690985ddf832d1f39fad443af 100644 (file)
--- 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
                      ))
     {
@@ -84,18 +82,12 @@ bool wxStaticBox::Create(
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
-    wxFont*                          pTextFont = new wxFont( 10
-                                                            ,wxMODERN
-                                                            ,wxNORMAL
-                                                            ,wxNORMAL
-                                                           );
-    SetFont(*pTextFont);
+    SetFont(*wxSMALL_FONT);
     SetSize( rPos.x
             ,rPos.y
             ,rSize.x
             ,rSize.y
            );
-    delete pTextFont;
     return TRUE;
 } // end of wxStaticBox::Create
 
@@ -104,11 +96,12 @@ wxSize wxStaticBox::DoGetBestSize() const
     int                             nCx;
     int                             nCy;
     int                             wBox;
+    wxFont                          vFont = GetFont();
 
     wxGetCharSize( GetHWND()
                   ,&nCx
                   ,&nCy
-                  ,(wxFont*)&GetFont()
+                  ,&vFont
                  );
     GetTextExtent( wxGetWindowText(m_hWnd)
                   ,&wBox