X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d261710b8a6cf129d9670d640a4d5df3ca6c0cc..85a0a12a9c6fe2885c0de8801e91a2f6d6e4119a:/src/mac/carbon/statlmac.cpp?ds=sidebyside diff --git a/src/mac/carbon/statlmac.cpp b/src/mac/carbon/statlmac.cpp index 93644da485..d0102cc8c3 100644 --- a/src/mac/carbon/statlmac.cpp +++ b/src/mac/carbon/statlmac.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: generic/statline.cpp +// Name: src/mac/carbon/statlmac.cpp // Purpose: a generic 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" @@ -27,10 +23,15 @@ #pragma hdrstop #endif +#if wxUSE_STATLINE + #include "wx/statline.h" -#include "wx/statbox.h" -#include +#ifndef WX_PRECOMP + #include "wx/statbox.h" +#endif + +#include "wx/mac/uma.h" // ============================================================================ // implementation @@ -49,15 +50,19 @@ bool wxStaticLine::Create( wxWindow *parent, long style, const wxString &name) { - Rect bounds ; - Str255 title ; - - MacPreControlCreate( parent , id , "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ; + m_macIsUserPane = false ; + + if ( !wxStaticLineBase::Create(parent, id, pos, size, + style, wxDefaultValidator, name) ) + return false; - m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, - kControlSeparatorLineProc , (long) this ) ; - - MacPostControlCreate() ; + Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + m_peer = new wxMacControl(this) ; + verify_noerr(CreateSeparatorControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, m_peer->GetControlRefAddr() ) ) ; - return TRUE; + MacPostControlCreate(pos,size) ; + + return true; } + +#endif //wxUSE_STATLINE