Removed duplicate xh_grid.cpp/h and rebaked files

[wxWidgets.git] / include / wx / mac / carbon / scrolbar.h

diff --git a/include/wx/mac/carbon/scrolbar.h b/include/wx/mac/carbon/scrolbar.h
index 633b615cedf9cd55268a53d1c1cfd376aa2f1116..0c56d1963d987dabf3deb2dd081d1b1462364549 100644 (file)
--- a/include/wx/mac/carbon/scrolbar.h
+++ b/include/wx/mac/carbon/scrolbar.h
@@ -12,10 +12,6 @@
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 
 #ifndef _WX_SCROLBAR_H_
 #define _WX_SCROLBAR_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "scrolbar.h"
-#endif
-

 #include "wx/control.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr;
 #include "wx/control.h"
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr;


@@ -57,8 +53,8 @@ public:
     bool refresh = TRUE);
 
   void Command(wxCommandEvent& event);
     bool refresh = TRUE);
 
   void Command(wxCommandEvent& event);

-        virtual void                         MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
-
+    virtual void  MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+    virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) ;

 protected:
     int m_pageSize;
     int m_viewSize;
 protected:
     int m_pageSize;
     int m_viewSize;