X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/982b2cfc58f424589a11538f6f7deef3b3217f0f..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/motif/toolbar.h diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h index bbf08831cc..c577b02a8f 100644 --- a/include/wx/motif/toolbar.h +++ b/include/wx/motif/toolbar.h @@ -6,16 +6,12 @@ // 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 { public: @@ -23,11 +19,11 @@ public: wxToolBar() { Init(); } wxToolBar(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxNO_BORDER | wxTB_HORIZONTAL, - const wxString& name = wxToolBarNameStr) + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxNO_BORDER | wxTB_HORIZONTAL, + const wxString& name = wxToolBarNameStr) { Init(); @@ -35,11 +31,11 @@ public: } bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxNO_BORDER | wxTB_HORIZONTAL, - const wxString& name = wxToolBarNameStr); + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxNO_BORDER | wxTB_HORIZONTAL, + const wxString& name = wxToolBarNameStr); virtual ~wxToolBar(); @@ -53,7 +49,7 @@ public: // find tool by widget wxToolBarToolBase *FindToolByWidget(WXWidget w) const; -protected: +private: // common part of all ctors void Init(); @@ -66,14 +62,19 @@ protected: virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); virtual wxToolBarToolBase *CreateTool(int id, - const wxBitmap& bitmap1, - const wxBitmap& bitmap2, - bool toggle, + const wxString& label, + const wxBitmap& bmpNormal, + const wxBitmap& bmpDisabled, + wxItemKind kind, wxObject *clientData, - const wxString& shortHelpString, - const wxString& longHelpString); - virtual wxToolBarToolBase *CreateTool(wxControl *control); - + 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) };