Revert r71595 for now, as the bug it fixed is the lesser of two evils with the potential bugs it causes. See #14453.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -543,26 +543,4 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event))
|
||||
|
||||
#endif // !__WXWINCE__
|
||||
|
||||
|
||||
wxPoint wxStaticBox::GetClientAreaOrigin() const
|
||||
{
|
||||
// See: http://msdn.microsoft.com/en-us/library/aa511279.aspx
|
||||
wxPoint pt = ConvertDialogToPixels(wxPoint(6,11));
|
||||
return pt;
|
||||
}
|
||||
|
||||
|
||||
void wxStaticBox::DoGetClientSize(int *width, int *height) const
|
||||
{
|
||||
// See: http://msdn.microsoft.com/en-us/library/aa511279.aspx
|
||||
wxPoint lr = ConvertDialogToPixels(wxPoint(6,7));
|
||||
wxPoint ul = GetClientAreaOrigin();
|
||||
wxSize sz = GetSize();
|
||||
|
||||
if (width)
|
||||
*width = sz.x - ul.x - lr.x;
|
||||
if (height)
|
||||
*height = sz.y - ul.y - lr.x;
|
||||
}
|
||||
|
||||
#endif // wxUSE_STATBOX
|
||||
|
||||
Reference in New Issue
Block a user