Use parents client size and origin in placement of controls.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -138,7 +138,7 @@ bool wxButton::Create(wxWindow *parent,
|
||||
wxPoint palmPos(pos);
|
||||
if((palmPos.x==wxDefaultCoord)||(palmPos.y==wxDefaultCoord))
|
||||
{
|
||||
wxSize parentSize(parent->GetSize());
|
||||
wxSize parentSize(parent->GetClientSize());
|
||||
wxWindow* parentTLW = parent;
|
||||
while ( parentTLW && !parentTLW->IsTopLevel() )
|
||||
{
|
||||
@@ -148,14 +148,14 @@ bool wxButton::Create(wxWindow *parent,
|
||||
if(wxDynamicCast(parentTLW, wxFrame)!=NULL)
|
||||
{
|
||||
if(palmPos.x==wxDefaultCoord)
|
||||
palmPos.x = 1;
|
||||
palmPos.x = 0;
|
||||
if(palmPos.y==wxDefaultCoord)
|
||||
palmPos.y = parentSize.y-palmSize.y;
|
||||
}
|
||||
else if(wxDynamicCast(parentTLW, wxDialog)!=NULL)
|
||||
{
|
||||
if(palmPos.x==wxDefaultCoord)
|
||||
palmPos.x = 5;
|
||||
palmPos.x = 4;
|
||||
if(palmPos.y==wxDefaultCoord)
|
||||
palmPos.y = parentSize.y-palmSize.y-5;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user