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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 1e96c7fd2995cc451a27d49e2b88ae5ac57cfcb8..cc6983b3fcb612c445b7c63b27456580b2e4d586 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -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)

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index e80276a71e35d5ed3aca134da9b20c707d630479..d6c56f61d43e1f32dc3bdd1301dded1ad8ec953c 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -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},

diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp
index 92344499351b6c286c4341aca67d5f30f3b51888..2d0702f53cfce7ea4a9752b28af278b053c8688f 100644 (file)
--- a/src/generic/laywin.cpp
+++ b/src/generic/laywin.cpp
@@ -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;

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 98979b04660880077e5f67aef60d074f4b429bac..60f71d3082f97cc4404b67fdc2872a2388d50e05 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -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);