Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified OS X Panther detection code.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2004-02-14 02:40:59 +00:00
parent 04ebdf400c
commit 78ca56690e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/sizer.cpp
View File

@@ -27,6 +27,10 @@
#include "wx/notebook.h" #include "wx/notebook.h"
#include "wx/listimpl.cpp" #include "wx/listimpl.cpp"
#ifdef __WXMAC__
# include "wx/mac/uma.h"
#endif
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
IMPLEMENT_CLASS(wxSizerItem, wxObject) IMPLEMENT_CLASS(wxSizerItem, wxObject)
@@ -1555,15 +1559,11 @@ static void GetStaticBoxBorders( wxStaticBox *box,
if ( extraTop == -1 ) if ( extraTop == -1 )
{ {
int verMaj, verMin;
(void) ::wxGetOsVersion(&verMaj, &verMin);
// The minimal border used for the top. Later on the staticbox' // The minimal border used for the top. Later on the staticbox'
// font height is added to this. // font height is added to this.
extraTop = 0; extraTop = 0;
// Is the Mac OS version OS X Panther or higher? if ( UMAGetSystemVersion() >= 0x1030 /*Panther*/ )
if ( ((verMaj << 16) + verMin) >= 0x00100030 )
{ {
// As indicated by the HIG, Panther needs an extra border of 11 // As indicated by the HIG, Panther needs an extra border of 11
// pixels (otherwise overlapping occurs at the top). The "other" // pixels (otherwise overlapping occurs at the top). The "other"