fixed what looked like a bug in determining the default width in DoGetBestSize()

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

diff --git a/src/mac/carbon/tabctrl.cpp b/src/mac/carbon/tabctrl.cpp
index ab984484fd34a85cbf6b8b1b92f3287794f8c18a..a8b350e713c53c7d1200c0bab4343c5694d83a94 100644 (file)
--- a/src/mac/carbon/tabctrl.cpp
+++ b/src/mac/carbon/tabctrl.cpp
@@ -43,9 +43,24 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
     m_imageList = NULL;
     
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
-    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , 0 , 1, 
-        kControlTabSmallProc , (long) this ) ;
+
+    UInt16 tabstyle = kControlTabDirectionNorth ;
+    ControlTabSize tabsize = kControlTabSizeLarge ;
+    if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
+        tabsize = kControlTabSizeSmall ;
+    else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
+    {
+        if (UMAGetSystemVersion() >= 0x1030 )
+            tabsize = 3 ; 
+        else
+            tabsize = kControlSizeSmall; 
+    }
+    
+    m_peer = new wxMacControl() ;
+    verify_noerr ( CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
+     tabsize , tabstyle, 0, NULL,  m_peer->GetControlRefAddr() ) );
     
+
     MacPostControlCreate(pos,size) ;
     return TRUE ;
 }