Handle client data correctly.

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

diff --git a/src/mac/tabctrl.cpp b/src/mac/tabctrl.cpp
index 6e79c8838681839edd60c613af033d4e388b9dff..f879b78447ee48b39f29593830cdf32cd40949b2 100644 (file)
--- a/src/mac/tabctrl.cpp
+++ b/src/mac/tabctrl.cpp
@@ -34,12 +34,16 @@ 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)
 {

+    if ( !wxControl::Create(parent, id, pos, size,
+                            style, wxDefaultValidator, name) )
+        return false;
+

     Rect bounds ;
     Str255 title ;
     
     m_imageList = NULL;
     
     Rect bounds ;
     Str255 title ;
     
     m_imageList = NULL;
     

-    MacPreControlCreate( parent , id ,  "" , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;
+    MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style, wxDefaultValidator , name , &bounds , title ) ;

     
     m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
         kControlTabSmallProc , (long) this ) ;
     
     m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 1, 
         kControlTabSmallProc , (long) this ) ;


@@ -115,7 +119,7 @@ int wxTabCtrl::GetRowCount() const
 wxString wxTabCtrl::GetItemText(int item) const
 {
     // TODO
 wxString wxTabCtrl::GetItemText(int item) const
 {
     // TODO

-    return wxString("");
+    return wxEmptyString;

 }
 
 // Get the item image
 }
 
 // Get the item image