X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cc985face55ed02c310860afefc8e6d656fb849d..99d21c0e1f8d87570702c52dccd3ad698f0a0931:/src/msw/statline.cpp?ds=inline diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp index 5737b15039..4c902f5398 100644 --- a/src/msw/statline.cpp +++ b/src/msw/statline.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/statline.cpp +// Name: src/msw/statline.cpp // Purpose: MSW version of wxStaticLine class // Author: Vadim Zeitlin // Created: 28.06.99 @@ -16,10 +16,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "statline.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -29,58 +25,107 @@ #include "wx/statline.h" -#include "wx/msw/private.h" +#if wxUSE_STATLINE + +#ifndef WX_PRECOMP + #include "wx/msw/private.h" + #include "wx/msw/missing.h" +#endif // ============================================================================ // implementation // ============================================================================ +#if wxUSE_EXTENDED_RTTI +WX_DEFINE_FLAGS( wxStaticLineStyle ) + +wxBEGIN_FLAGS( wxStaticLineStyle ) + // new style border flags, we put them first to + // use them for streaming out + wxFLAGS_MEMBER(wxBORDER_SIMPLE) + wxFLAGS_MEMBER(wxBORDER_SUNKEN) + wxFLAGS_MEMBER(wxBORDER_DOUBLE) + wxFLAGS_MEMBER(wxBORDER_RAISED) + wxFLAGS_MEMBER(wxBORDER_STATIC) + wxFLAGS_MEMBER(wxBORDER_NONE) + + // old style border flags + wxFLAGS_MEMBER(wxSIMPLE_BORDER) + wxFLAGS_MEMBER(wxSUNKEN_BORDER) + wxFLAGS_MEMBER(wxDOUBLE_BORDER) + wxFLAGS_MEMBER(wxRAISED_BORDER) + wxFLAGS_MEMBER(wxSTATIC_BORDER) + wxFLAGS_MEMBER(wxBORDER) + + // standard window styles + wxFLAGS_MEMBER(wxTAB_TRAVERSAL) + wxFLAGS_MEMBER(wxCLIP_CHILDREN) + wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) + wxFLAGS_MEMBER(wxWANTS_CHARS) + wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) + wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) + wxFLAGS_MEMBER(wxVSCROLL) + wxFLAGS_MEMBER(wxHSCROLL) + + wxFLAGS_MEMBER(wxLI_HORIZONTAL) + wxFLAGS_MEMBER(wxLI_VERTICAL) + +wxEND_FLAGS( wxStaticLineStyle ) + +IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticLine, wxControl,"wx/statline.h") + +wxBEGIN_PROPERTIES_TABLE(wxStaticLine) + wxPROPERTY_FLAGS( WindowStyle , wxStaticLineStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style +wxEND_PROPERTIES_TABLE() + +wxBEGIN_HANDLERS_TABLE(wxStaticLine) +wxEND_HANDLERS_TABLE() + +wxCONSTRUCTOR_5( wxStaticLine, wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle) + +#else IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl) +#endif + +/* + TODO PROPERTIES : + style (wxLI_HORIZONTAL) +*/ // ---------------------------------------------------------------------------- // wxStaticLine // ---------------------------------------------------------------------------- -bool wxStaticLine::Create( wxWindow *parent, - wxWindowID id, - const wxPoint &pos, - const wxSize &size, - long style, - const wxString &name) +bool wxStaticLine::Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& sizeOrig, + long style, + const wxString &name) { - if ( !CreateBase(parent, id, pos, size, style, name) ) - return FALSE; + wxSize size = AdjustSize(sizeOrig); + + if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) ) + return false; - parent->AddChild(this); + return MSWCreateControl(_T("STATIC"), wxEmptyString, pos, size); +} + +WXDWORD wxStaticLine::MSWGetStyle(long style, WXDWORD *exstyle) const +{ + // we never have border + style &= ~wxBORDER_MASK; + style |= wxBORDER_NONE; - wxSize sizeReal = AdjustSize(size); + WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle); -#ifndef WIN32 -#define SS_SUNKEN 0 + // add our default styles + msStyle |= SS_SUNKEN | SS_NOTIFY | WS_CLIPSIBLINGS; +#ifndef __WXWINCE__ + msStyle |= SS_GRAYRECT ; #endif - m_hWnd = (WXHWND)::CreateWindow - ( - _T("STATIC"), - "", - WS_VISIBLE | WS_CHILD | - SS_GRAYRECT | SS_SUNKEN, // | SS_ETCHEDFRAME, - pos.x, pos.y, sizeReal.x, sizeReal.y, - GetWinHwnd(parent), - (HMENU)m_windowId, - wxGetInstance(), - NULL - ); - - if ( !m_hWnd ) - { - wxLogDebug(_T("Failed to create static control")); - - return FALSE; - } - - SubclassWin(m_hWnd); - - return TRUE; + return msStyle ; } +#endif // wxUSE_STATLINE