added adjustOrigin parameter to bounds calculation, added Freeze and Thaw implementation

[wxWidgets.git] / src / mac / carbon / statbox.cpp

diff --git a/src/mac/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp
index cef41efca71b196cf8bd19d551f83a408bc1d60a..2f6068ce9638ccbd51323ce6a8a2f3c389260d6f 100644 (file)
--- a/src/mac/carbon/statbox.cpp
+++ b/src/mac/carbon/statbox.cpp
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:    wxWindows licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -20,11 +20,6 @@
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-
-BEGIN_EVENT_TABLE(wxStaticBox, wxControl)
-       EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
-END_EVENT_TABLE()
-
 #endif
 
 /*
@@ -38,15 +33,20 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
-       Rect bounds ;
-       Str255 title ;
-       
-       MacPreControlCreate( parent , id ,  label , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
-
-       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
-               kControlGroupBoxTextTitleProc , (long) this ) ;
-       
-       MacPostControlCreate() ;
-
-  return TRUE;
+    m_macIsUserPane = FALSE ;
+    
+    if ( !wxControl::Create(parent, id, pos, size,
+                            style, wxDefaultValidator, name) )
+        return false;
+
+    m_label = label ;
+
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    
+    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , 0 , 1, 
+        kControlGroupBoxTextTitleProc , (long) this ) ;
+    
+    MacPostControlCreate(pos,size) ;
+    
+    return TRUE;
 }