Corrected wxScrollBar style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -53,6 +53,9 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
|
|||||||
SetValidator(validator);
|
SetValidator(validator);
|
||||||
#endif // wxUSE_VALIDATORS
|
#endif // wxUSE_VALIDATORS
|
||||||
|
|
||||||
|
if ((style & wxBORDER_MASK) == wxBORDER_DEFAULT)
|
||||||
|
style |= wxNO_BORDER;
|
||||||
|
|
||||||
SetBackgroundColour(parent->GetBackgroundColour()) ;
|
SetBackgroundColour(parent->GetBackgroundColour()) ;
|
||||||
SetForegroundColour(parent->GetForegroundColour()) ;
|
SetForegroundColour(parent->GetForegroundColour()) ;
|
||||||
m_windowStyle = style;
|
m_windowStyle = style;
|
||||||
@@ -88,7 +91,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
|
|||||||
// Now create scrollbar
|
// Now create scrollbar
|
||||||
DWORD _direction = (style & wxHORIZONTAL) ?
|
DWORD _direction = (style & wxHORIZONTAL) ?
|
||||||
SBS_HORZ: SBS_VERT;
|
SBS_HORZ: SBS_VERT;
|
||||||
HWND scroll_bar = CreateWindowEx(wstyle, wxT("SCROLLBAR"), wxT("scrollbar"),
|
HWND scroll_bar = CreateWindowEx(exStyle, wxT("SCROLLBAR"), wxT("scrollbar"),
|
||||||
_direction | wstyle,
|
_direction | wstyle,
|
||||||
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
|
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
|
||||||
wxGetInstance(), NULL);
|
wxGetInstance(), NULL);
|
||||||
|
Reference in New Issue
Block a user