X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/854e189f90dac9ba5e0239bca79aed64e8d6f46c..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/xrc/xh_toolb.h?ds=sidebyside diff --git a/include/wx/xrc/xh_toolb.h b/include/wx/xrc/xh_toolb.h index 6d71a41a29..6ba95f7124 100644 --- a/include/wx/xrc/xh_toolb.h +++ b/include/wx/xrc/xh_toolb.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_toolb.h -// Purpose: XML resource handler for wxBoxSizer +// Name: wx/xrc/xh_toolb.h +// Purpose: XML resource handler for wxToolBar // Author: Vaclav Slavik // Created: 2000/08/11 // RCS-ID: $Id$ @@ -11,19 +11,16 @@ #ifndef _WX_XH_TOOLB_H_ #define _WX_XH_TOOLB_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "xh_toolb.h" -#endif - #include "wx/xrc/xmlres.h" -#if wxUSE_TOOLBAR +#if wxUSE_XRC && wxUSE_TOOLBAR -class WXDLLEXPORT wxToolBar; +class WXDLLIMPEXP_FWD_CORE wxToolBar; -class WXXMLDLLEXPORT wxToolBarXmlHandler : public wxXmlResourceHandler +class WXDLLIMPEXP_XRC wxToolBarXmlHandler : public wxXmlResourceHandler { -DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler) + DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler) + public: wxToolBarXmlHandler(); virtual wxObject *DoCreateResource(); @@ -32,8 +29,9 @@ public: private: bool m_isInside; wxToolBar *m_toolbar; + wxSize m_toolSize; }; -#endif +#endif // wxUSE_XRC && wxUSE_TOOLBAR -#endif // _WX_XH_TOOLBAR_H_ +#endif // _WX_XH_TOOLB_H_