X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..a8d2fb31cbf09dcc4683c9566ff4bc89580f268c:/src/mac/carbon/statbox.cpp?ds=sidebyside

diff --git a/src/mac/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp
index ea7ca9dfbb..2bff927aae 100644
--- a/src/mac/carbon/statbox.cpp
+++ b/src/mac/carbon/statbox.cpp
@@ -1,32 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbox.cpp
 // Purpose:     wxStaticBox
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "statbox.h"
-#endif
+#include "wx/wxprec.h"
+
+#if wxUSE_STATBOX
 
 #include "wx/statbox.h"
 #include "wx/mac/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
-BEGIN_EVENT_TABLE(wxStaticBox, wxControl)
-	EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
-END_EVENT_TABLE()
-
-
 /*
  * Static box
  */
- 
+
 bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
            const wxPoint& pos,
@@ -34,15 +29,50 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
-	Rect bounds ;
-	Str255 title ;
-	
-	MacPreControlCreate( parent , id ,  label , pos , size ,style, *((wxValidator*)NULL) , name , &bounds , title ) ;
+    m_macIsUserPane = FALSE ;
+
+    if ( !wxControl::Create(parent, id, pos, size,
+                            style, wxDefaultValidator, name) )
+        return false;
 
-	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
-	  	kControlGroupBoxTextTitleProc , (long) this ) ;
-	
-	MacPostControlCreate() ;
+    m_label = label ;
 
-  return TRUE;
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+
+    m_peer = new wxMacControl(this) ;
+    verify_noerr(CreateGroupBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, CFSTR("") ,
+        true /*primary*/ , m_peer->GetControlRefAddr() ) ) ;
+
+    MacPostControlCreate(pos,size) ;
+
+    return TRUE;
 }
+
+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'
+        // font height is added to this.
+        extraTop = 0;
+
+        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"
+            // border has to be 11.
+            extraTop = 11;
+            other = 11;
+        }
+
+    }
+
+    *borderTop = extraTop + GetCharHeight();
+    *borderOther = other;
+}
+
+#endif // wxUSE_STATBOX
+