fixes for Raise() to work correctly with both top level and child windows

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

diff --git a/src/mac/carbon/tabctrl.cpp b/src/mac/carbon/tabctrl.cpp
index b3b45a72d12a038b60322fd7c374ac7ca3108551..2b4a07e0fbf3d56e670a56b2ad04d1831d0804e5 100644 (file)
--- a/src/mac/carbon/tabctrl.cpp
+++ b/src/mac/carbon/tabctrl.cpp
@@ -13,8 +13,11 @@
 #pragma implementation "tabctrl.h"
 #endif
 
 #pragma implementation "tabctrl.h"
 #endif
 

+#include "wx/defs.h"
+

 #include "wx/control.h"
 #include "wx/tabctrl.h"
 #include "wx/control.h"
 #include "wx/tabctrl.h"

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

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


@@ -31,20 +34,18 @@ wxTabCtrl::wxTabCtrl()
 bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
             long style, const wxString& name)
 {
 bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
             long style, const wxString& name)
 {

-    m_imageList = NULL;
-
-    SetName(name);
-
-    m_windowStyle = style;
+       Rect bounds ;
+       Str255 title ;

 
 

-    SetParent(parent);
+  m_imageList = NULL;
+       
+       MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;

 
 

-    m_windowId = (id < 0 ? NewControlId() : id);
-
-    if (parent) parent->AddChild(this);
-
-    // TODO: create tab control
-    return FALSE;
+       m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 1, 
+               kControlTabSmallProc , (long) this ) ;
+       
+       MacPostControlCreate() ;
+       return TRUE ;

 }
 
 wxTabCtrl::~wxTabCtrl()
 }
 
 wxTabCtrl::~wxTabCtrl()