X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5b208a1796ecf1b9ab267d200705b4f3b4d10e3..bbca44f104e713b55c340475d9f3d104a5ceb624:/src/osx/statbox_osx.cpp diff --git a/src/osx/statbox_osx.cpp b/src/osx/statbox_osx.cpp index 216b6fd919..0d9c91c629 100644 --- a/src/osx/statbox_osx.cpp +++ b/src/osx/statbox_osx.cpp @@ -16,8 +16,6 @@ #include "wx/statbox.h" #include "wx/osx/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) - bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString& label, @@ -25,15 +23,15 @@ bool wxStaticBox::Create( wxWindow *parent, const wxSize& size, long style, const wxString& name ) -{ - m_macIsUserPane = false; - +{ + DontCreatePeer(); + if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) ) return false; m_labelOrig = m_label = label; - m_peer = wxWidgetImpl::CreateGroupBox( this, parent, id, label, pos, size, style, GetExtraStyle() ); + SetPeer(wxWidgetImpl::CreateGroupBox( this, parent, id, label, pos, size, style, GetExtraStyle() )); MacPostControlCreate( pos, size ); @@ -55,7 +53,11 @@ void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const // pixels (otherwise overlapping occurs at the top). The "other" // border has to be 11. extraTop = 11; +#if wxOSX_USE_COCOA + other = 17; +#else other = 11; +#endif } *borderTop = extraTop;