X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fdaf613add176525ed8b6cafaf278dfd80f85074..b28aeea5cad996158ccc8c63d19aae3786f7b8b2:/src/mac/carbon/statlmac.cpp?ds=sidebyside diff --git a/src/mac/carbon/statlmac.cpp b/src/mac/carbon/statlmac.cpp index f5802a2095..92d31f27e2 100644 --- a/src/mac/carbon/statlmac.cpp +++ b/src/mac/carbon/statlmac.cpp @@ -16,7 +16,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "statline.h" #endif @@ -30,7 +30,7 @@ #include "wx/statline.h" #include "wx/statbox.h" -#include +#include "wx/mac/uma.h" // ============================================================================ // implementation @@ -49,15 +49,17 @@ 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_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, - kControlSeparatorLineProc , (long) this ) ; - - MacPostControlCreate() ; + m_macIsUserPane = FALSE ; + + if ( !wxStaticLineBase::Create(parent, id, pos, size, + style, wxDefaultValidator, name) ) + return false; + + Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + m_peer = new wxMacControl() ; + verify_noerr(CreateSeparatorControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, m_peer->GetControlRefAddr() ) ) ; + + MacPostControlCreate(pos,size) ; return TRUE; }