X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8d99be5f5381dad56492da02c2df1c3ec0750926..606b005fb2b535b34d1ca45d2d06ee86718e8b1c:/src/msw/statline.cpp?ds=sidebyside diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp index 55d237160d..2bf14042af 100644 --- a/src/msw/statline.cpp +++ b/src/msw/statline.cpp @@ -34,6 +34,14 @@ #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 // ============================================================================ @@ -58,16 +66,17 @@ bool wxStaticLine::Create( wxWindow *parent, 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"), - _T(""), - 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, @@ -77,9 +86,8 @@ bool wxStaticLine::Create( wxWindow *parent, if ( !m_hWnd ) { -#ifdef __WXDEBUG__ - wxLogDebug(_T("Failed to create static control")); -#endif + wxLogDebug(wxT("Failed to create static control")); + return FALSE; } @@ -87,5 +95,6 @@ bool wxStaticLine::Create( wxWindow *parent, return TRUE; } -#endif + +#endif // wxUSE_STATLINE