X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42b1fb630d94b919d455c1f0f2212bc6bcc04d46..96c9640205933ad0673d5af2c96af0816c50160c:/src/msw/statline.cpp diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp index 9f8dc7f91c..a10a33176a 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 // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "statline.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -31,68 +27,15 @@ #if wxUSE_STATLINE -#include "wx/msw/private.h" +#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 // ---------------------------------------------------------------------------- @@ -109,7 +52,7 @@ bool wxStaticLine::Create(wxWindow *parent, if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) ) return false; - return MSWCreateControl(_T("STATIC"), wxEmptyString, pos, size); + return MSWCreateControl(wxT("STATIC"), wxEmptyString, pos, size); } WXDWORD wxStaticLine::MSWGetStyle(long style, WXDWORD *exstyle) const @@ -130,4 +73,3 @@ WXDWORD wxStaticLine::MSWGetStyle(long style, WXDWORD *exstyle) const } #endif // wxUSE_STATLINE -