added conversion routines to CIconHandle, removing pre 8.6 routines

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

diff --git a/src/mac/statbox.cpp b/src/mac/statbox.cpp
index ea7ca9dfbbad0aec9a119692f7e34d4e5693b794..400eb43169e524aceec43cc43a76882e5a9f5310 100644 (file)
--- a/src/mac/statbox.cpp
+++ b/src/mac/statbox.cpp
@@ -13,15 +13,19 @@
 #pragma implementation "statbox.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/statbox.h"
 #include "wx/mac/uma.h"
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxStaticBox, wxControl)
        EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
 END_EVENT_TABLE()
 
+#endif
 
 /*
  * Static box
@@ -37,9 +41,9 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
        Rect bounds ;
        Str255 title ;
        
-       MacPreControlCreate( parent , id ,  label , pos , size ,style, *((wxValidator*)NULL) , name , &bounds , title ) ;
+       MacPreControlCreate( parent , id ,  label , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
+       m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
                kControlGroupBoxTextTitleProc , (long) this ) ;
        
        MacPostControlCreate() ;