Window management and sizer layout corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -113,14 +113,12 @@ void wxTopLevelWindowBase::DoClientToScreen(int *x, int *y) const
|
|||||||
// whole client area
|
// whole client area
|
||||||
void wxTopLevelWindowBase::OnSize(wxSizeEvent& WXUNUSED(event))
|
void wxTopLevelWindowBase::OnSize(wxSizeEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
// if we're using constraints - do use them
|
// if we're using constraints or sizers - do use them
|
||||||
#if wxUSE_CONSTRAINTS
|
|
||||||
if ( GetAutoLayout() )
|
if ( GetAutoLayout() )
|
||||||
{
|
{
|
||||||
Layout();
|
Layout();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif // wxUSE_CONSTRAINTS
|
|
||||||
{
|
{
|
||||||
// do we have _exactly_ one child?
|
// do we have _exactly_ one child?
|
||||||
wxWindow *child = (wxWindow *)NULL;
|
wxWindow *child = (wxWindow *)NULL;
|
||||||
|
@@ -163,6 +163,7 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
|
|||||||
FocusChangeMask |
|
FocusChangeMask |
|
||||||
ColormapChangeMask |
|
ColormapChangeMask |
|
||||||
StructureNotifyMask |
|
StructureNotifyMask |
|
||||||
|
ConfigureNotify |
|
||||||
PropertyChangeMask
|
PropertyChangeMask
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -416,6 +417,11 @@ bool wxSetWMDecorations(Window w, long style)
|
|||||||
{
|
{
|
||||||
wmProp.props |= GR_WM_PROPS_CAPTION ;
|
wmProp.props |= GR_WM_PROPS_CAPTION ;
|
||||||
wmProp.flags |= GR_WM_FLAGS_PROPS ;
|
wmProp.flags |= GR_WM_FLAGS_PROPS ;
|
||||||
|
|
||||||
|
// The default dialog style doesn't include any kind
|
||||||
|
// of border, which is a bit odd. Anyway, inclusion
|
||||||
|
// of a caption surely implies a border.
|
||||||
|
style |= wxTHICK_FRAME;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (style & wxTHICK_FRAME)
|
if (style & wxTHICK_FRAME)
|
||||||
|
Reference in New Issue
Block a user