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

Further border style corrections.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-05-26 22:15:25 +00:00
parent 245abf09bf
commit e0b9ad2982
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/statbmp.cpp
View File

@@ -98,6 +98,12 @@ bool wxStaticBitmap::Create(wxWindow *parent,
long style, long style,
const wxString& name) const wxString& name)
{ {
// default border for this control is none
if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
{
style |= wxBORDER_NONE;
}
if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) ) if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
return FALSE; return FALSE;

1
src/msw/window.cpp
View File

@@ -1034,6 +1034,7 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
// 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() && if (border == wxBORDER_DEFAULT && wxTheApp->GetAuto3D() &&
IsKindOf(CLASSINFO(wxControl)) &&
GetParent() && (GetParent()->IsKindOf(CLASSINFO(wxPanel)) || GetParent() && (GetParent()->IsKindOf(CLASSINFO(wxPanel)) ||
GetParent()->IsKindOf(CLASSINFO(wxDialog))) && GetParent()->IsKindOf(CLASSINFO(wxDialog))) &&
((GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS)) ((GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS) != wxUSER_COLOURS))