Added wxCLIP_SIBLINGS. CVS also seems to think lots of other files need updating.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
aa21b5090a
commit
d11bb14faa
@ -862,6 +862,9 @@ enum wxStretch
|
||||
// splitter windows, but can't be used in a panel where a static box must be
|
||||
// 'transparent' (panel paints the background for it)
|
||||
#define wxCLIP_CHILDREN 0x00400000
|
||||
// Note we're reusing the wxCAPTION style because we won't need captions
|
||||
// for subwindows/controls
|
||||
#define wxCLIP_SIBLINGS 0x20000000
|
||||
|
||||
// Add this style to a panel to get tab traversal working outside of dialogs
|
||||
// (on by default for wxPanel, wxDialog, wxScrolledWindow)
|
||||
|
@ -2210,6 +2210,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
|
||||
{ wxT("wxTRANSPARENT_WINDOW"), wxTRANSPARENT_WINDOW},
|
||||
{ wxT("wxNO_BORDER"), wxNO_BORDER},
|
||||
{ wxT("wxCLIP_CHILDREN"), wxCLIP_CHILDREN},
|
||||
{ wxT("wxCLIP_SIBLINGS"), wxCLIP_SIBLINGS},
|
||||
{ wxT("wxTAB_TRAVERSAL"), 0}, // Compatibility only
|
||||
|
||||
{ wxT("wxTINY_CAPTION_HORIZ"), wxTINY_CAPTION_HORIZ},
|
||||
|
@ -292,11 +292,11 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
|
||||
rect = event.GetRect();
|
||||
|
||||
if (mainWindow)
|
||||
mainWindow->SetSize(rect.x, rect.y, rect.width, rect.height);
|
||||
mainWindow->SetSize(rect.x, rect.y, wxMax(0, rect.width), wxMax(0, rect.height));
|
||||
else if (lastAwareWindow)
|
||||
{
|
||||
// Fit the remaining space
|
||||
lastAwareWindow->SetSize(rect.x, rect.y, rect.width, rect.height);
|
||||
lastAwareWindow->SetSize(rect.x, rect.y, wxMax(0, rect.width), wxMax(0, rect.height));
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
@ -316,6 +316,8 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
|
||||
msflags |= WS_CHILD | WS_VISIBLE;
|
||||
if ( style & wxCLIP_CHILDREN )
|
||||
msflags |= WS_CLIPCHILDREN;
|
||||
if ( style & wxCLIP_SIBLINGS )
|
||||
msflags |= WS_CLIPSIBLINGS;
|
||||
|
||||
bool want3D;
|
||||
WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
|
||||
|
Loading…
Reference in New Issue
Block a user