merge of wxMac into main repository

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/mac/toolbar.h

@@ -60,6 +60,9 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
   // Add all the buttons
 
 	virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+	virtual wxString MacGetToolTipString( wxPoint &where ) ;
+	void OnPaint(wxPaintEvent& event) ;
+	void OnMouse(wxMouseEvent& event) ;
 protected:
     // common part of all ctors
     void Init();