X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb0afb266214f827417c42474168c7edda7c953e..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/msw/statline.cpp diff --git a/src/msw/statline.cpp b/src/msw/statline.cpp index dd44a18ebd..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 // ---------------------------------------------------------------------------- -#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,15 +27,9 @@ #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 +#ifndef WX_PRECOMP + #include "wx/msw/private.h" + #include "wx/msw/missing.h" #endif // ============================================================================ @@ -58,7 +48,7 @@ wxBEGIN_FLAGS( wxStaticLineStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -85,7 +75,7 @@ wxEND_FLAGS( wxStaticLineStyle ) IMPLEMENT_DYNAMIC_CLASS_XTI(wxStaticLine, wxControl,"wx/statline.h") wxBEGIN_PROPERTIES_TABLE(wxStaticLine) - wxPROPERTY_FLAGS( WindowStyle , wxStaticLineStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style + wxPROPERTY_FLAGS( WindowStyle , wxStaticLineStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style wxEND_PROPERTIES_TABLE() wxBEGIN_HANDLERS_TABLE(wxStaticLine) @@ -98,8 +88,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl) #endif /* - TODO PROPERTIES : - style (wxLI_HORIZONTAL) + TODO PROPERTIES : + style (wxLI_HORIZONTAL) */ // ---------------------------------------------------------------------------- @@ -116,7 +106,7 @@ bool wxStaticLine::Create(wxWindow *parent, wxSize size = AdjustSize(sizeOrig); if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) ) - return FALSE; + return false; return MSWCreateControl(_T("STATIC"), wxEmptyString, pos, size); } @@ -139,4 +129,3 @@ WXDWORD wxStaticLine::MSWGetStyle(long style, WXDWORD *exstyle) const } #endif // wxUSE_STATLINE -