Applied notebook font patch.

[wxWidgets.git] / include / wx / mac / toolbar.h

diff --git a/include/wx/mac/toolbar.h b/include/wx/mac/toolbar.h
index c5a26d024f246046943a7c6e6001ecb91851fa98..1849125750ba3bead7d493cfce68ffd686ca6515 100644 (file)
--- a/include/wx/mac/toolbar.h
+++ b/include/wx/mac/toolbar.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TOOLBAR_H_
 #define _WX_TOOLBAR_H_
 
 #ifndef _WX_TOOLBAR_H_
 #define _WX_TOOLBAR_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "toolbar.h"
 #endif
 
 #pragma interface "toolbar.h"
 #endif
 


@@ -31,14 +31,13 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
    * Public interface
    */
 
    * 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)
 
 
   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);
   {
     Init();
     Create(parent, id, pos, size, style, name);


@@ -61,7 +60,7 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
 
   // Add all the buttons
 
 
   // 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) ;
     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);
 
                                           const wxString& longHelp);
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 

-    wxArrayPtrVoid    m_macToolHandles ;
-

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };