allowing shaped windows again

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

diff --git a/src/mac/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp
index b239dc738c830175d1f18afc795245ca00b4ecee..870154ebba917a0cd88953fe0d0b1b6e4c28d7d1 100644 (file)
--- a/src/mac/carbon/statbox.cpp
+++ b/src/mac/carbon/statbox.cpp
@@ -1,27 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbox.cpp
 // Purpose:     wxStaticBox
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbox.cpp
 // Purpose:     wxStaticBox

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "statbox.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "statbox.h"
 #endif
 

+#include "wx/defs.h"
+

 #include "wx/statbox.h"
 #include "wx/statbox.h"

+#include "wx/mac/uma.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)

-
-BEGIN_EVENT_TABLE(wxStaticBox, wxControl)
-       EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
-END_EVENT_TABLE()
-

 #endif
 
 /*
 #endif
 
 /*


@@ -35,28 +33,20 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

-    SetName(name);
-
-    if (parent) parent->AddChild(this);
-
-    if ( id == -1 )
-           m_windowId = (int)NewControlId();
-    else
-           m_windowId = id;
-
-    m_windowStyle = style;
-
-    // TODO: create static box
-    return FALSE;
-}
-
-void wxStaticBox::SetLabel(const wxString& label)
-{
-    // TODO
+    m_macIsUserPane = FALSE ;
+    
+    if ( !wxControl::Create(parent, id, pos, size,
+                            style, wxDefaultValidator, name) )
+        return false;
+
+    m_label = label ;
+
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    
+    verify_noerr(CreateGroupBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, CFSTR("") , 
+        true /*primary*/ , (ControlRef*)&m_macControl ) ) ;  
+
+    MacPostControlCreate(pos,size) ;
+    
+    return TRUE;

 }
 }

-
-void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // TODO
-}
-