made wx[Array]TreeItemId[s] more backwards compatible

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

diff --git a/include/wx/mac/toolbar.h b/include/wx/mac/toolbar.h
index fd64e322f51e4ab8c1c1c5a1b07a59bfd33747a6..c6c02dfed086b14ef70dc39c685e80d4be59bc5c 100644 (file)
--- a/include/wx/mac/toolbar.h
+++ b/include/wx/mac/toolbar.h
@@ -21,7 +21,7 @@
 #include "wx/tbarbase.h"
 #include "wx/dynarray.h"
 
 #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
 {
 
 class WXDLLEXPORT wxToolBar: public wxToolBarBase
 {


@@ -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()
 };