X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/motif/toolbar.h diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h index 13af97b8f5..c577b02a8f 100644 --- a/include/wx/motif/toolbar.h +++ b/include/wx/motif/toolbar.h @@ -6,22 +6,18 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_TOOLBAR_H_ #define _WX_TOOLBAR_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "toolbar.h" -#endif - class WXDLLEXPORT wxToolBar : public wxToolBarBase { public: // ctors and dtor wxToolBar() { Init(); } - + wxToolBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -30,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, @@ -73,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, @@ -83,4 +80,4 @@ private: }; #endif -// _WX_TOOLBAR_H_ + // _WX_TOOLBAR_H_