git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16503
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
{
wxControl::DoMoveWindow(x, y, width, height);
{
wxControl::DoMoveWindow(x, y, width, height);
- wxPoint p = GetParent() ?
- GetParent()->GetClientAreaOrigin() : wxPoint(0,0);
-
// position the subcontrols inside the client area
wxSize sizeBtn = m_btn->GetSize();
wxCoord wText = width - sizeBtn.x;
// position the subcontrols inside the client area
wxSize sizeBtn = m_btn->GetSize();
wxCoord wText = width - sizeBtn.x;
- m_text->SetSize(x-p.x, y-p.y, wText, height);
+ m_text->SetSize(x, y, wText, height);
- m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, -1);
+ m_btn->SetSize(x + wText + MARGIN, y, -1, -1);
- m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, height);
+ m_btn->SetSize(x + wText + MARGIN, y, -1, height);