X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3c0f9e75f16f7b636bdf7cd1b821e41e0f61592..196cc38b26fb577274d307ba664dbc5a3196f301:/src/msw/statline.cpp?ds=inline diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp index 46df810d04..2bf14042af 100644 --- a/src/msw/statline.cpp +++ b/src/msw/statline.cpp @@ -32,6 +32,15 @@ #if wxUSE_STATLINE #include "wx/msw/private.h" +#include "wx/log.h" + +#ifndef SS_SUNKEN + #define SS_SUNKEN 0x00001000L +#endif + +#ifndef SS_NOTIFY + #define SS_NOTIFY 0x00000100L +#endif // ============================================================================ // implementation @@ -50,23 +59,24 @@ bool wxStaticLine::Create( wxWindow *parent, long style, const wxString &name) { - if ( !CreateBase(parent, id, pos, size, style, name) ) + if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) return FALSE; parent->AddChild(this); wxSize sizeReal = AdjustSize(size); -#ifndef WIN32 -#define SS_SUNKEN 0 -#endif + DWORD wstyle = WS_CHILD | WS_VISIBLE | SS_GRAYRECT | SS_SUNKEN | SS_NOTIFY; + + if ( style & wxCLIP_SIBLINGS ) + wstyle |= WS_CLIPSIBLINGS; + m_hWnd = (WXHWND)::CreateWindow ( - _T("STATIC"), - "", - WS_VISIBLE | WS_CHILD | - SS_GRAYRECT | SS_SUNKEN, // | SS_ETCHEDFRAME, + wxT("STATIC"), + wxT(""), + wstyle, pos.x, pos.y, sizeReal.x, sizeReal.y, GetWinHwnd(parent), (HMENU)m_windowId, @@ -76,7 +86,7 @@ bool wxStaticLine::Create( wxWindow *parent, if ( !m_hWnd ) { - wxLogDebug(_T("Failed to create static control")); + wxLogDebug(wxT("Failed to create static control")); return FALSE; } @@ -85,5 +95,6 @@ bool wxStaticLine::Create( wxWindow *parent, return TRUE; } -#endif + +#endif // wxUSE_STATLINE