correcting DropData behaviour so that preferred format is handled correctly

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

diff --git a/src/mac/carbon/tabctrl.cpp b/src/mac/carbon/tabctrl.cpp
index e96fb25f807e21866b7c4a03a36326d4de389539..12d52b880167457d65bec478b712d02d43584387 100644 (file)
--- a/src/mac/carbon/tabctrl.cpp
+++ b/src/mac/carbon/tabctrl.cpp
@@ -9,22 +9,25 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "tabctrl.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #include "wx/control.h"
 #include "wx/tabctrl.h"
 #include "wx/mac/uma.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxNotifyEvent)
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TAB_SEL_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TAB_SEL_CHANGING)
+
 
 BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
 END_EVENT_TABLE()
-#endif
 
 wxTabCtrl::wxTabCtrl()
 {
@@ -56,8 +59,10 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
             tabsize = kControlSizeSmall; 
     }
     
+    m_peer = new wxMacControl(this) ;
     verify_noerr ( CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
-     tabsize , tabstyle, 0, NULL, (ControlRef*) &m_macControl) ); 
+     tabsize , tabstyle, 0, NULL,  m_peer->GetControlRefAddr() ) );
+    
 
     MacPostControlCreate(pos,size) ;
     return TRUE ;
@@ -207,11 +212,3 @@ void wxTabCtrl::SetPadding(const wxSize& padding)
     // TODO
 }
 
-// Tab event
-IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxCommandEvent)
-
-wxTabEvent::wxTabEvent(wxEventType commandType, int id):
-  wxCommandEvent(commandType, id)
-{
-}
-