X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4e41ce37ac7bcb43663241439cee68ebeff7ffc..7af0846427683d08c44b5d88f39c932ace31843c:/include/wx/mac/toolbar.h diff --git a/include/wx/mac/toolbar.h b/include/wx/mac/toolbar.h index c5a26d024f..c6c02dfed0 100644 --- a/include/wx/mac/toolbar.h +++ b/include/wx/mac/toolbar.h @@ -31,14 +31,13 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase * Public interface */ - wxToolBar() : m_macToolHandles() { Init(); } + wxToolBar() { Init(); } inline wxToolBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER|wxTB_HORIZONTAL, const wxString& name = wxToolBarNameStr) - : m_macToolHandles() { Init(); Create(parent, id, pos, size, style, name); @@ -61,7 +60,7 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase // Add all the buttons - virtual void MacHandleControlClick( WXWidget control , short controlpart ) ; + virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ; virtual wxString MacGetToolTipString( wxPoint &where ) ; void OnPaint(wxPaintEvent& event) ; void OnMouse(wxMouseEvent& event) ; @@ -88,8 +87,6 @@ protected: const wxString& longHelp); virtual wxToolBarToolBase *CreateTool(wxControl *control); - wxArrayPtrVoid m_macToolHandles ; - DECLARE_EVENT_TABLE() };