Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. wxWindow::Centre() hopefully fixed

Browse Source 
2. attempts to construct bitmaps from icons properly
3. wxTreeCtrl background is always white


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-08-01 22:22:02 +00:00
parent 4ee14879f2
commit 10fcf31a2c
6 changed files with 108 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/wincmn.cpp
View File

@@ -303,15 +303,22 @@ void wxWindowBase::Centre(int direction)
int widthParent, heightParent;
wxWindow *parent = GetParent();
if ( (direction & wxCENTER_FRAME) && parent )
if ( !parent )
{
parent->GetClientSize(&widthParent, &heightParent);
// no other choice
direction |= wxCENTRE_ON_SCREEN;
}
else
if ( direction & wxCENTRE_ON_SCREEN )
{
// centre with respect to the whole screen
wxDisplaySize(&widthParent, &heightParent);
}
else
{
// centre inside the parents rectangle
parent->GetClientSize(&widthParent, &heightParent);
}
int width, height;
GetSize(&width, &height);
@@ -327,8 +334,11 @@ void wxWindowBase::Centre(int direction)
// controls are always centered on their parent because it doesn't make
// sense to centre them on the screen
if ( (direction & wxCENTER_FRAME) || wxDynamicCast(this, wxControl) )
if ( !(direction & wxCENTRE_ON_SCREEN) || wxDynamicCast(this, wxControl) )
{
// theo nly chance to get this is to have a wxControl without parent
wxCHECK_RET( parent, _T("a control must have a parent") );
// adjust to the parents client area origin
wxPoint posParent = parent->ClientToScreen(wxPoint(0, 0));