X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..f36b3a915e4543fbbd9c911724404b016972aabc:/include/wx/univ/toolbar.h diff --git a/include/wx/univ/toolbar.h b/include/wx/univ/toolbar.h index 73b35cb0a6..feb9ae4bc3 100644 --- a/include/wx/univ/toolbar.h +++ b/include/wx/univ/toolbar.h @@ -12,10 +12,6 @@ #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; @@ -63,6 +59,8 @@ public: 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,10 @@ 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); protected: // common part of all ctors void Init(); @@ -93,10 +94,6 @@ protected: const wxString& longHelp); virtual wxToolBarToolBase *CreateTool(wxControl *control); - // 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, @@ -110,7 +107,7 @@ 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