don't draw borders for bitmap buttons with wxBORDER_NONE style

[wxWidgets.git] / include / wx / osx / carbon / dataview.h

diff --git a/include/wx/osx/carbon/dataview.h b/include/wx/osx/carbon/dataview.h
index 14b1e58673c5b097ccf063b6d6ca406527b874e8..336c577f23dda5a416da268671295a3744b975c8 100644 (file)
--- a/include/wx/osx/carbon/dataview.h
+++ b/include/wx/osx/carbon/dataview.h
@@ -14,8 +14,6 @@
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

-#include <carbon/carbon.h>
-

 #include "wx/osx/core/dataview.h"
 #include "wx/osx/private.h"
 
 #include "wx/osx/core/dataview.h"
 #include "wx/osx/private.h"
 


@@ -131,6 +129,7 @@ public:
   wxMacDataBrowserTableViewControl(void)
   {
   }
   wxMacDataBrowserTableViewControl(void)
   {
   }

+  ~wxMacDataBrowserTableViewControl(void);

 
 //
 // callback handling
 
 //
 // callback handling


@@ -312,6 +311,11 @@ protected :
   virtual Boolean DataBrowserAddDragItemProc(DragReference dragRef, DataBrowserItemID itemID, ItemReference* itemRef) = 0;
   virtual Boolean DataBrowserReceiveDragProc(DragReference dragRef, DataBrowserItemID itemID)                         = 0;
 
   virtual Boolean DataBrowserAddDragItemProc(DragReference dragRef, DataBrowserItemID itemID, ItemReference* itemRef) = 0;
   virtual Boolean DataBrowserReceiveDragProc(DragReference dragRef, DataBrowserItemID itemID)                         = 0;
 

+//
+// event handler for hit testing
+///
+  void*  m_macDataViewCtrlEventHandler;
+  

 private:
 //
 // wxWidget internal stuff
 private:
 //
 // wxWidget internal stuff