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

Fixed a problem with borders being set wrong sometimes on wxMSW, XP, VC++ 7

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-19 23:13:53 +00:00
parent 5f265f87d9
commit c76b1a30fa
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/listbox.cpp
View File

@@ -161,6 +161,10 @@ bool wxListBox::Create(wxWindow *parent,
wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED), wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
_T("only one of listbox selection modes can be specified") ); _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 ) if ( m_windowStyle & wxCLIP_SIBLINGS )
wstyle |= WS_CLIPSIBLINGS; wstyle |= WS_CLIPSIBLINGS;

4
src/msw/spinctrl.cpp
View File

@@ -214,6 +214,10 @@ bool wxSpinCtrl::Create(wxWindow *parent,
// know whether this is a horizontal or vertical control (we're always // know whether this is a horizontal or vertical control (we're always
// vertical) // vertical)
style |= wxSP_VERTICAL; style |= wxSP_VERTICAL;
if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
style |= wxBORDER_SUNKEN;
SetWindowStyle(style); SetWindowStyle(style);
// calculate the sizes: the size given is the toal size for both controls // calculate the sizes: the size given is the toal size for both controls

3
src/msw/textctrl.cpp
View File

@@ -444,6 +444,9 @@ WXDWORD wxTextCtrl::MSWGetStyle(long style, WXDWORD *exstyle) const
void wxTextCtrl::SetWindowStyleFlag(long style) void wxTextCtrl::SetWindowStyleFlag(long style)
{ {
if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
style |= wxBORDER_SUNKEN;
#if wxUSE_RICHEDIT #if wxUSE_RICHEDIT
// we have to deal with some styles separately because they can't be // we have to deal with some styles separately because they can't be
// changed by simply calling SetWindowLong(GWL_STYLE) but can be changed // changed by simply calling SetWindowLong(GWL_STYLE) but can be changed