Implemented wxDC stack with focus locking and unlocking

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

diff --git a/include/wx/mac/toolbar.h b/include/wx/mac/toolbar.h
index 2c24882618d70a15c382422540207ddd6a3456ff..c6c02dfed086b14ef70dc39c685e80d4be59bc5c 100644 (file)
--- a/include/wx/mac/toolbar.h
+++ b/include/wx/mac/toolbar.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        toolbar.h
 // Purpose:     wxToolBar class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOOLBAR_H_
 #define _WX_TOOLBAR_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "toolbar.h"
 #endif
 
@@ -21,7 +21,7 @@
 #include "wx/tbarbase.h"
 #include "wx/dynarray.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
 
 class WXDLLEXPORT wxToolBar: public wxToolBarBase
 {
@@ -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,11 +60,11 @@ class WXDLLEXPORT wxToolBar: public wxToolBarBase
 
   // Add all the buttons
 
-       virtual void MacHandleControlClick( WXWidget control , short controlpart ) ;
-       virtual wxString MacGetToolTipString( wxPoint &where ) ;
-       void OnPaint(wxPaintEvent& event) ;
-       void OnMouse(wxMouseEvent& event) ;
-       virtual void MacSuperChangedPosition() ;
+    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+    virtual wxString MacGetToolTipString( wxPoint &where ) ;
+    void OnPaint(wxPaintEvent& event) ;
+    void OnMouse(wxMouseEvent& event) ;
+    virtual void MacSuperChangedPosition() ;
 protected:
     // common part of all ctors
     void Init();
@@ -88,9 +87,7 @@ protected:
                                           const wxString& longHelp);
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 
-       wxArrayPtrVoid  m_macToolHandles ;
-
-       DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
 #endif // wxUSE_TOOLBAR