X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3216dbf5dccab8ed6dc0245b7e5c998738ef51d7..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/univ/toolbar.h diff --git a/include/wx/univ/toolbar.h b/include/wx/univ/toolbar.h index 52d53e606b..272cef7b38 100644 --- a/include/wx/univ/toolbar.h +++ b/include/wx/univ/toolbar.h @@ -6,19 +6,15 @@ // Created: 10.09.00 // RCS-ID: $Id$ // Copyright: (c) Robert Roebling -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_UNIV_TOOLBAR_H_ #define _WX_UNIV_TOOLBAR_H_ -#ifdef __GNUG__ - #pragma interface "univtoolbar.h" -#endif - #include "wx/button.h" // for wxStdButtonInputHandler -class WXDLLEXPORT wxToolBarTool; +class WXDLLIMPEXP_FWD_CORE wxToolBarTool; // ---------------------------------------------------------------------------- // the actions supported by this control @@ -36,7 +32,7 @@ class WXDLLEXPORT wxToolBarTool; // ---------------------------------------------------------------------------- class WXDLLEXPORT wxToolBar : public wxToolBarBase -{ +{ public: // construction/destruction wxToolBar() { Init(); } @@ -58,15 +54,30 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxToolBarNameStr ); - + virtual ~wxToolBar(); virtual bool Realize(); + virtual void SetWindowStyleFlag( long style ); + virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; virtual void SetToolShortHelp(int id, const wxString& helpString); + virtual void SetMargins(int x, int y); + void SetMargins(const wxSize& size) + { SetMargins((int) size.x, (int) size.y); } + + virtual bool PerformAction(const wxControlAction& action, + long numArg = -1, + const wxString& strArg = wxEmptyString); + static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef); + virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef) + { + return GetStdInputHandler(handlerDef); + } + protected: // common part of all ctors void Init(); @@ -80,19 +91,20 @@ 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); - // implement wxUniversal methods - virtual bool PerformAction(const wxControlAction& action, - long numArg = -1, - const wxString& strArg = wxEmptyString); virtual wxSize DoGetBestClientSize() const; + virtual void DoSetSize(int x, int y, + int width, int height, + int sizeFlags = wxSIZE_AUTO); virtual void DoDraw(wxControlRenderer *renderer); // get the bounding rect for the given tool @@ -102,22 +114,13 @@ protected: void RefreshTool(wxToolBarToolBase *tool); // (re)calculate the tool positions, should only be called if it is - // necessary to do it, i.e. m_needsLayout == TRUE + // necessary to do it, i.e. m_needsLayout == true void DoLayout(); - + // get the rect limits depending on the orientation: top/bottom for a // vertical toolbar, left/right for a horizontal one void GetRectLimits(const wxRect& rect, wxCoord *start, wxCoord *end) const; - // wxButton actions: all these use m_toolPressed and can only be called if - // we have one - void Toggle(); - void Press(); - void Release(); - - // this one used m_toolCurrent - void Click(); - private: // have we calculated the positions of our tools? bool m_needsLayout; @@ -128,32 +131,9 @@ private: // the total size of all toolbar elements wxCoord m_maxWidth, m_maxHeight; - - // the current tool or NULL - wxToolBarToolBase *m_toolCurrent; - - // the currently pressed tool or NULL - wxToolBarToolBase *m_toolPressed; +private: DECLARE_DYNAMIC_CLASS(wxToolBar) }; -// ---------------------------------------------------------------------------- -// wxStdToolbarInputHandler: translates SPACE and ENTER keys and the left mouse -// click into button press/release actions -// ---------------------------------------------------------------------------- - -class WXDLLEXPORT wxStdToolbarInputHandler : public wxStdButtonInputHandler -{ -public: - wxStdToolbarInputHandler(wxInputHandler *inphand); - - virtual bool HandleKey(wxInputConsumer *consumer, - const wxKeyEvent& event, - bool pressed); - virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event); - virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event); - virtual bool HandleActivation(wxInputConsumer *consumer, bool activated); -}; - #endif // _WX_UNIV_TOOLBAR_H_