X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..0555b2a0a3c509687e7fc5aeb160f5171b7e6311:/include/wx/motif/toolbar.h diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h index 5e60f94c78..6407334fce 100644 --- a/include/wx/motif/toolbar.h +++ b/include/wx/motif/toolbar.h @@ -6,18 +6,18 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_TOOLBAR_H_ #define _WX_TOOLBAR_H_ -class WXDLLEXPORT wxToolBar : public wxToolBarBase +class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase { public: // ctors and dtor wxToolBar() { Init(); } - + wxToolBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -26,41 +26,41 @@ public: const wxString& name = wxToolBarNameStr) { Init(); - + Create(parent, id, pos, size, style, name); } - + bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const wxString& name = wxToolBarNameStr); - + virtual ~wxToolBar(); - + // override/implement base class virtuals virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; - + virtual bool Realize(); - + // implementation from now on - + // find tool by widget wxToolBarToolBase *FindToolByWidget(WXWidget w) const; - + private: // common part of all ctors void Init(); - + // implement base class pure virtuals virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); - + virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable); virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); - + virtual wxToolBarToolBase *CreateTool(int id, const wxString& label, const wxBitmap& bmpNormal, @@ -69,7 +69,8 @@ private: wxObject *clientData, const wxString& shortHelp, const wxString& longHelp); - virtual wxToolBarToolBase *CreateTool(wxControl *control); + virtual wxToolBarToolBase *CreateTool(wxControl *control, + const wxString& label); virtual void DoSetSize(int x, int y, int width, int height, @@ -79,4 +80,4 @@ private: }; #endif -// _WX_TOOLBAR_H_ + // _WX_TOOLBAR_H_