carbon cfm fixes

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

diff --git a/src/mac/carbon/statbox.cpp b/src/mac/carbon/statbox.cpp
index c809df5da6e30f90b76c12969f2bcfc5cd076157..cc29e9b2675a79bb0a32b98546e3e18586fad3d5 100644 (file)
--- a/src/mac/carbon/statbox.cpp
+++ b/src/mac/carbon/statbox.cpp
@@ -6,14 +6,16 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWidgets licence
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "statbox.h"
 #endif
 
 #pragma implementation "statbox.h"
 #endif
 

-#include "wx/defs.h"
+#include "wx/wxprec.h"
+
+#if wxUSE_STATBOX

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


@@ -43,10 +45,13 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     
 
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     

+    m_peer = new wxMacControl(this) ;

     verify_noerr(CreateGroupBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, CFSTR("") , 
     verify_noerr(CreateGroupBoxControl(MAC_WXHWND(parent->MacGetTopLevelWindowRef()),&bounds, CFSTR("") , 

-        true /*primary*/ , (ControlRef*)&m_macControl ) ) ;  
+        true /*primary*/ , m_peer->GetControlRefAddr() ) ) ;  

 
     MacPostControlCreate(pos,size) ;
     
     return TRUE;
 }
 
     MacPostControlCreate(pos,size) ;
     
     return TRUE;
 }

+
+#endif
\ No newline at end of file