diff --git a/src/osx/statbox_osx.cpp b/src/osx/statbox_osx.cpp index 0d9c91c629..fec97c5f45 100644 --- a/src/osx/statbox_osx.cpp +++ b/src/osx/statbox_osx.cpp @@ -40,29 +40,18 @@ bool wxStaticBox::Create( wxWindow *parent, void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const { - static int extraTop = -1; // Uninitted - static int other = 5; - - if ( extraTop == -1 ) - { - // The minimal border used for the top. - // Later on, the staticbox's font height is added to this. - extraTop = 0; - - // As indicated by the HIG, Panther needs an extra border of 11 - // 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 - } + static int extraTop = 11; + static int other = 11; *borderTop = extraTop; if ( !m_label.empty() ) + { +#if wxOSX_USE_COCOA + *borderTop += 11; +#else *borderTop += GetCharHeight(); +#endif + } *borderOther = other; }