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

Added wxCLIP_SIBLINGS. CVS also seems to think lots of other files need updating.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-08-29 12:46:21 +00:00
parent aa21b5090a
commit d11bb14faa
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/defs.h
View File

@@ -862,6 +862,9 @@ enum wxStretch
// splitter windows, but can't be used in a panel where a static box must be // splitter windows, but can't be used in a panel where a static box must be
// 'transparent' (panel paints the background for it) // 'transparent' (panel paints the background for it)
#define wxCLIP_CHILDREN 0x00400000 #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 // Add this style to a panel to get tab traversal working outside of dialogs
// (on by default for wxPanel, wxDialog, wxScrolledWindow) // (on by default for wxPanel, wxDialog, wxScrolledWindow)

1
src/common/resource.cpp
View File

@@ -2210,6 +2210,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
{ wxT("wxTRANSPARENT_WINDOW"), wxTRANSPARENT_WINDOW}, { wxT("wxTRANSPARENT_WINDOW"), wxTRANSPARENT_WINDOW},
{ wxT("wxNO_BORDER"), wxNO_BORDER}, { wxT("wxNO_BORDER"), wxNO_BORDER},
{ wxT("wxCLIP_CHILDREN"), wxCLIP_CHILDREN}, { wxT("wxCLIP_CHILDREN"), wxCLIP_CHILDREN},
{ wxT("wxCLIP_SIBLINGS"), wxCLIP_SIBLINGS},
{ wxT("wxTAB_TRAVERSAL"), 0}, // Compatibility only { wxT("wxTAB_TRAVERSAL"), 0}, // Compatibility only
{ wxT("wxTINY_CAPTION_HORIZ"), wxTINY_CAPTION_HORIZ}, { wxT("wxTINY_CAPTION_HORIZ"), wxTINY_CAPTION_HORIZ},

4
src/generic/laywin.cpp
View File

@@ -292,11 +292,11 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
rect = event.GetRect(); rect = event.GetRect();
if (mainWindow) 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) else if (lastAwareWindow)
{ {
// Fit the remaining space // 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; return TRUE;

2
src/msw/window.cpp
View File

@@ -316,6 +316,8 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
msflags |= WS_CHILD | WS_VISIBLE; msflags |= WS_CHILD | WS_VISIBLE;
if ( style & wxCLIP_CHILDREN ) if ( style & wxCLIP_CHILDREN )
msflags |= WS_CLIPCHILDREN; msflags |= WS_CLIPCHILDREN;
if ( style & wxCLIP_SIBLINGS )
msflags |= WS_CLIPSIBLINGS;
bool want3D; bool want3D;
WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D); WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);