still overriding the escape key

[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 0c56d1963d987dabf3deb2dd081d1b1462364549..b2538c5548b260dbfa32dfc2d201bc4b8186865a 100644 (file)
--- a/include/wx/mac/carbon/scrolbar.h
+++ b/include/wx/mac/carbon/scrolbar.h
@@ -14,7 +14,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxScrollBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxScrollBarNameStr[];
 
 // Scrollbar item
 class WXDLLEXPORT wxScrollBar: public wxControl
@@ -55,6 +55,9 @@ public:
   void Command(wxCommandEvent& event);
     virtual void  MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
     virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) ;
+
+    wxSize DoGetBestSize() const;
+    
 protected:
     int m_pageSize;
     int m_viewSize;