Fixed a problem with borders being set wrong sometimes on wxMSW, XP, VC++ 7
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -161,6 +161,10 @@ bool wxListBox::Create(wxWindow *parent,
|
||||
|
||||
wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
|
||||
_T("only one of listbox selection modes can be specified") );
|
||||
|
||||
if ( (m_windowStyle & wxBORDER_MASK) == wxBORDER_DEFAULT )
|
||||
m_windowStyle |= wxBORDER_SUNKEN;
|
||||
|
||||
if ( m_windowStyle & wxCLIP_SIBLINGS )
|
||||
wstyle |= WS_CLIPSIBLINGS;
|
||||
|
||||
|
@@ -214,6 +214,10 @@ bool wxSpinCtrl::Create(wxWindow *parent,
|
||||
// know whether this is a horizontal or vertical control (we're always
|
||||
// vertical)
|
||||
style |= wxSP_VERTICAL;
|
||||
|
||||
if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
|
||||
style |= wxBORDER_SUNKEN;
|
||||
|
||||
SetWindowStyle(style);
|
||||
|
||||
// calculate the sizes: the size given is the toal size for both controls
|
||||
|
@@ -444,6 +444,9 @@ WXDWORD wxTextCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
|
||||
|
||||
void wxTextCtrl::SetWindowStyleFlag(long style)
|
||||
{
|
||||
if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
|
||||
style |= wxBORDER_SUNKEN;
|
||||
|
||||
#if wxUSE_RICHEDIT
|
||||
// we have to deal with some styles separately because they can't be
|
||||
// changed by simply calling SetWindowLong(GWL_STYLE) but can be changed
|
||||
|
Reference in New Issue
Block a user