X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34d26f42b16d6fb233988fec2a7fa6c8f397972d..d24b23b76eca69c0faecf6146f52f6d8f93d4b78:/include/wx/univ/toolbar.h diff --git a/include/wx/univ/toolbar.h b/include/wx/univ/toolbar.h index 5ca1a31a68..c080710eec 100644 --- a/include/wx/univ/toolbar.h +++ b/include/wx/univ/toolbar.h @@ -6,13 +6,13 @@ // 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__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "univtoolbar.h" #endif @@ -98,6 +98,9 @@ protected: 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 @@ -107,7 +110,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