X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a290fa5a7deebe9d96c0c0089d18e27d4bd9b624..0fe8a1b6ca95414cdffcb8120e7d6bdf44bf571d:/include/wx/univ/toolbar.h?ds=sidebyside diff --git a/include/wx/univ/toolbar.h b/include/wx/univ/toolbar.h index c080710eec..4827311177 100644 --- a/include/wx/univ/toolbar.h +++ b/include/wx/univ/toolbar.h @@ -12,13 +12,9 @@ #ifndef _WX_UNIV_TOOLBAR_H_ #define _WX_UNIV_TOOLBAR_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #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 @@ -28,15 +24,15 @@ class WXDLLEXPORT wxToolBarTool; #define wxACTION_TOOLBAR_PRESS wxACTION_BUTTON_PRESS #define wxACTION_TOOLBAR_RELEASE wxACTION_BUTTON_RELEASE #define wxACTION_TOOLBAR_CLICK wxACTION_BUTTON_CLICK -#define wxACTION_TOOLBAR_ENTER _T("enter") // highlight the tool -#define wxACTION_TOOLBAR_LEAVE _T("leave") // unhighlight the tool +#define wxACTION_TOOLBAR_ENTER wxT("enter") // highlight the tool +#define wxACTION_TOOLBAR_LEAVE wxT("leave") // unhighlight the tool // ---------------------------------------------------------------------------- // wxToolBar // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxToolBar : public wxToolBarBase -{ +class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase +{ public: // construction/destruction wxToolBar() { Init(); } @@ -58,11 +54,13 @@ 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); @@ -70,7 +68,16 @@ public: 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(); @@ -91,12 +98,9 @@ protected: wxObject *clientData, const wxString& shortHelp, const wxString& longHelp); - virtual wxToolBarToolBase *CreateTool(wxControl *control); + 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, @@ -112,7 +116,7 @@ protected: // (re)calculate the tool positions, should only be called if it is // 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; @@ -132,29 +136,4 @@ 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 wxStdInputHandler -{ -public: - wxStdToolbarInputHandler(wxInputHandler *inphand); - - virtual bool HandleKey(wxInputConsumer *consumer, - const wxKeyEvent& event, - bool pressed); - virtual bool HandleMouse(wxInputConsumer *consumer, - const wxMouseEvent& event); - virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event); - virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event); - virtual bool HandleActivation(wxInputConsumer *consumer, bool activated); - -private: - wxWindow *m_winCapture; - wxToolBarToolBase *m_toolCapture; - wxToolBarToolBase *m_toolLast; -}; - #endif // _WX_UNIV_TOOLBAR_H_