Make wxr resources work in Unicode mode.

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

diff --git a/src/mac/carbon/tabctrl.cpp b/src/mac/carbon/tabctrl.cpp
index ed13c3ac8aa2a0ef896c7e9ac9566288c2616127..db1992be6e20ae5ad57927b8a7a559a5b9550492 100644 (file)
--- a/src/mac/carbon/tabctrl.cpp
+++ b/src/mac/carbon/tabctrl.cpp
@@ -13,14 +13,18 @@
 #pragma implementation "tabctrl.h"
 #endif
 
+#include "wx/defs.h"
+
 #include "wx/control.h"
 #include "wx/tabctrl.h"
 #include "wx/mac/uma.h"
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
 END_EVENT_TABLE()
+#endif
 
 wxTabCtrl::wxTabCtrl()
 {
@@ -35,9 +39,9 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
 
   m_imageList = NULL;
        
-       MacPreControlCreate( parent , id ,  "" , pos , size ,style, *((wxValidator*)NULL) , name , &bounds , title ) ;
+       MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
 
-       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 1, 
+       m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
                kControlTabSmallProc , (long) this ) ;
        
        MacPostControlCreate() ;