X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4765d335f603c29f1fd300288ff1d40a118fcf0e..f114b8580b980c54e7b6194fe6494a86cb833907:/include/wx/mac/toolbar.h?ds=sidebyside

diff --git a/include/wx/mac/toolbar.h b/include/wx/mac/toolbar.h
index 63c3d7f937..caef6bccd2 100644
--- a/include/wx/mac/toolbar.h
+++ b/include/wx/mac/toolbar.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TOOLBAR_H_
 #define _WX_TOOLBAR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "toolbar.h"
 #endif
 
@@ -31,12 +31,14 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
    * Public interface
    */
 
-   wxToolBar() { Init(); }
+   wxToolBar() : m_macToolHandles() { 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)
+  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);
@@ -59,7 +61,11 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
 
   // Add all the buttons
 
-	virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+	virtual void MacHandleControlClick( WXWidget control , short controlpart ) ;
+	virtual wxString MacGetToolTipString( wxPoint &where ) ;
+	void OnPaint(wxPaintEvent& event) ;
+	void OnMouse(wxMouseEvent& event) ;
+	virtual void MacSuperChangedPosition() ;
 protected:
     // common part of all ctors
     void Init();
@@ -73,12 +79,13 @@ protected:
     virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
 
     virtual wxToolBarToolBase *CreateTool(int id,
-                                          const wxBitmap& bitmap1,
-                                          const wxBitmap& bitmap2,
-                                          bool toggle,
+                                          const wxString& label,
+                                          const wxBitmap& bmpNormal,
+                                          const wxBitmap& bmpDisabled,
+                                          wxItemKind kind,
                                           wxObject *clientData,
-                                          const wxString& shortHelpString,
-                                          const wxString& longHelpString);
+                                          const wxString& shortHelp,
+                                          const wxString& longHelp);
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 
 	wxArrayPtrVoid	m_macToolHandles ;