X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fcb35b5f0577a323f3289f78cb6c7b3b39217397..da0766ab2ae2357cd4dc111415731ee85aa45984:/include/wx/motif/toolbar.h diff --git a/include/wx/motif/toolbar.h b/include/wx/motif/toolbar.h index fdb2e95681..14cd50c0ee 100644 --- a/include/wx/motif/toolbar.h +++ b/include/wx/motif/toolbar.h @@ -12,7 +12,7 @@ #ifndef _WX_TOOLBAR_H_ #define _WX_TOOLBAR_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "toolbar.h" #endif @@ -53,7 +53,7 @@ public: // find tool by widget wxToolBarToolBase *FindToolByWidget(WXWidget w) const; -protected: +private: // common part of all ctors void Init(); @@ -74,7 +74,10 @@ protected: const wxString& shortHelp, const wxString& longHelp); virtual wxToolBarToolBase *CreateTool(wxControl *control); - + + virtual void DoSetSize(int x, int y, + int width, int height, + int sizeFlags = wxSIZE_AUTO); private: DECLARE_DYNAMIC_CLASS(wxToolBar) };