X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c54b92d36364306f76745ce319e5314b54ea7690..facd6764872eede45605ba7c9dfa0e1d0c708fa2:/src/common/sizer.cpp

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 0e9587b451..4cee972c00 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -27,6 +27,10 @@
 #include "wx/notebook.h"
 #include "wx/listimpl.cpp"
 
+#ifdef __WXMAC__
+#   include "wx/mac/uma.h"
+#endif
+
 //---------------------------------------------------------------------------
 
 IMPLEMENT_CLASS(wxSizerItem, wxObject)
@@ -641,6 +645,10 @@ wxSize wxSizer::GetMinWindowSize( wxWindow *window )
                    minSize.y+size.y-client_size.y );
 }
 
+// TODO on mac we need a function that determines how much free space this
+// min size contains, in order to make sure that we have 20 pixels of free
+// space around the controls
+
 // Return a window size that will fit within the screens dimensions
 wxSize wxSizer::FitSize( wxWindow *window )
 {
@@ -1555,15 +1563,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"