X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..08202189cbf2f78d932f85b9733b69e24f08e58c:/include/wx/mac/carbon/scrolbar.h?ds=sidebyside diff --git a/include/wx/mac/carbon/scrolbar.h b/include/wx/mac/carbon/scrolbar.h index 0c56d1963d..cabbeb9dc3 100644 --- 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 @@ -23,7 +23,7 @@ class WXDLLEXPORT wxScrollBar: public wxControl public: inline wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; } - ~wxScrollBar(); + virtual ~wxScrollBar(); inline wxScrollBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -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;