X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee6b1d97e741fda8d579fa21cbc89f0c91615cef..3bf2bdfb7d1f680e54e89e55e22ebd5e912bebe8:/src/mac/carbon/statlmac.cpp diff --git a/src/mac/carbon/statlmac.cpp b/src/mac/carbon/statlmac.cpp index 52f3d40733..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,6 +30,8 @@ #include "wx/statline.h" #include "wx/statbox.h" +#include "wx/mac/uma.h" + // ============================================================================ // implementation // ============================================================================ @@ -47,15 +49,17 @@ bool wxStaticLine::Create( wxWindow *parent, long style, const wxString &name) { - if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) - return FALSE; - - // ok, this is ugly but it's better than nothing: use a thin static box to - // emulate static line + m_macIsUserPane = FALSE ; + + if ( !wxStaticLineBase::Create(parent, id, pos, size, + style, wxDefaultValidator, name) ) + return false; - wxSize sizeReal = AdjustSize(size); + Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + m_peer = new wxMacControl() ; + verify_noerr(CreateSeparatorControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, m_peer->GetControlRefAddr() ) ) ; -// m_statbox = new wxStaticBox(parent, id, wxT(""), pos, sizeReal, style, name); + MacPostControlCreate(pos,size) ; return TRUE; }