X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..0555b2a0a3c509687e7fc5aeb160f5171b7e6311:/include/wx/motif/toolbar.h diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h index f7864c43af..6407334fce 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: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_TOOLBAR_H_ #define _WX_TOOLBAR_H_ -#ifdef __GNUG__ -#pragma interface "toolbar.h" -#endif - -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, @@ -30,53 +26,58 @@ 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; - -protected: + +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 wxBitmap& bitmap1, - const wxBitmap& bitmap2, - bool toggle, - wxObject *clientData, - const wxString& shortHelpString, - const wxString& longHelpString); - virtual wxToolBarToolBase *CreateTool(wxControl *control); - + const wxString& label, + const wxBitmap& bmpNormal, + const wxBitmap& bmpDisabled, + wxItemKind kind, + wxObject *clientData, + const wxString& shortHelp, + const wxString& longHelp); + virtual wxToolBarToolBase *CreateTool(wxControl *control, + const wxString& label); + + virtual void DoSetSize(int x, int y, + int width, int height, + int sizeFlags = wxSIZE_AUTO); private: DECLARE_DYNAMIC_CLASS(wxToolBar) }; #endif -// _WX_TOOLBAR_H_ + // _WX_TOOLBAR_H_