/////////////////////////////////////////////////////////////////////////////
-// Name: toolbar.h
+// Name: wx/mac/carbon/toolbar.h
// Purpose: wxToolBar class
// Author: Stefan Csomor
// Modified by:
#include "wx/tbarbase.h"
#include "wx/dynarray.h"
-WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const char) wxToolBarNameStr[];
class WXDLLEXPORT wxToolBar: public wxToolBarBase
{
Init();
Create(parent, id, pos, size, style, name);
}
- ~wxToolBar();
+ virtual ~wxToolBar();
bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxNO_BORDER|wxTB_HORIZONTAL,
virtual bool Show(bool show = true);
virtual bool IsShown() const;
- virtual void DoGetSize(int *width, int *height) const;
- virtual wxSize DoGetBestSize() const ;
virtual bool Realize();
virtual void SetToolBitmapSize(const wxSize& size);
virtual void SetRows(int nRows);
- // Add all the buttons
+ virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
+ virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
+
+ // Add all the buttons
virtual wxString MacGetToolTipString( wxPoint &where ) ;
void OnPaint(wxPaintEvent& event) ;
// common part of all ctors
void Init();
- // implement base class pure virtuals
+ virtual void DoGetSize(int *width, int *height) const;
+ virtual wxSize DoGetBestSize() const;
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
wxObject *clientData,
const wxString& shortHelp,
const wxString& longHelp);
- virtual wxToolBarToolBase *CreateTool(wxControl *control);
+ virtual wxToolBarToolBase *CreateTool(wxControl *control,
+ const wxString& label);
DECLARE_EVENT_TABLE()
-#if wxMAC_USE_NATIVE_TOOLBAR
- bool m_macUsesNativeToolbar ;
- void* m_macHIToolbarRef ;
+#if wxMAC_USE_NATIVE_TOOLBAR
+ bool m_macUsesNativeToolbar ;
+ void* m_macHIToolbarRef ;
#endif
};