,rPos
,rSize
,lStyle
-#if wxUSE_VALIDATORS
,wxDefaultValidator
-#endif
,rsName
))
{
wxPoint vPos(0,0);
wxSize vSize(0,0);
- if (!OS2CreateControl( "STATIC"
+ if (!OS2CreateControl( wxT("STATIC")
,SS_GROUPBOX
,vPos
,vSize
wxColour vColour;
- vColour.Set(wxString("BLACK"));
+ vColour.Set(wxString(wxT("BLACK")));
LONG lColor = (LONG)vColour.GetPixel();
,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
int nCx;
int nCy;
int wBox;
+ wxFont vFont = GetFont();
wxGetCharSize( GetHWND()
,&nCx
,&nCy
- ,(wxFont*)&GetFont()
+ ,&vFont
);
GetTextExtent( wxGetWindowText(m_hWnd)
,&wBox