Fix some style glitches
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -141,7 +141,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
|
|||||||
WXDWORD msflags = wxWindow::MSWGetStyle
|
WXDWORD msflags = wxWindow::MSWGetStyle
|
||||||
(
|
(
|
||||||
(style & ~wxBORDER_MASK) | wxBORDER_NONE, exflags
|
(style & ~wxBORDER_MASK) | wxBORDER_NONE, exflags
|
||||||
) & ~WS_CHILD;
|
) & ~WS_CHILD & ~WS_VISIBLE;
|
||||||
|
|
||||||
// first select the kind of window being created
|
// first select the kind of window being created
|
||||||
//
|
//
|
||||||
|
@@ -1161,7 +1161,8 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
|
|||||||
// is a more neutral term, we don't necessarily get a sunken effect in
|
// is a more neutral term, we don't necessarily get a sunken effect in
|
||||||
// Windows XP. Instead we get the appropriate style for the theme.
|
// Windows XP. Instead we get the appropriate style for the theme.
|
||||||
|
|
||||||
if (border == wxBORDER_DEFAULT && wxTheApp->GetAuto3D() && GetParent() &&
|
if (border == wxBORDER_DEFAULT && wxTheApp->GetAuto3D() &&
|
||||||
|
GetParent() && GetParent()->IsKindOf(CLASSINFO(wxPanel)) &&
|
||||||
((GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS))
|
((GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS))
|
||||||
{
|
{
|
||||||
border = (wxBorder)((flags & wxBORDER_MASK) | wxBORDER_SUNKEN);
|
border = (wxBorder)((flags & wxBORDER_MASK) | wxBORDER_SUNKEN);
|
||||||
|
Reference in New Issue
Block a user