X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670211021660f7adf0feed73da3a7065e863f132..aa154cb1578ba9d44c7e24c5e76d8238bf8809d0:/src/common/sizer.cpp diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 9dfa1e376d..f077fcd102 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -25,7 +25,11 @@ #include "wx/utils.h" #include "wx/statbox.h" #include "wx/notebook.h" -#include +#include "wx/listimpl.cpp" + +#ifdef __WXMAC__ +# include "wx/mac/uma.h" +#endif //--------------------------------------------------------------------------- @@ -1555,15 +1559,11 @@ static void GetStaticBoxBorders( wxStaticBox *box, if ( extraTop == -1 ) { - int verMaj, verMin; - (void) ::wxGetOsVersion(&verMaj, &verMin); - // The minimal border used for the top. Later on the staticbox' // font height is added to this. extraTop = 0; - // Is the Mac OS version OS X Panther or higher? - if ( ((verMaj << 16) + verMin) >= 0x00100030 ) + if ( UMAGetSystemVersion() >= 0x1030 /*Panther*/ ) { // As indicated by the HIG, Panther needs an extra border of 11 // pixels (otherwise overlapping occurs at the top). The "other"