Rebake from clean wx tree.

[wxWidgets.git] / include / wx / xrc / xh_toolb.h

diff --git a/include/wx/xrc/xh_toolb.h b/include/wx/xrc/xh_toolb.h
index c54b7810614405edc9d6dc228c27cc69ba074934..6ba95f7124fe3fbd08147ff2491c5ba471bf50f9 100644 (file)
--- 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$
 // Author:      Vaclav Slavik
 // Created:     2000/08/11
 // RCS-ID:      $Id$


@@ -11,19 +11,16 @@
 #ifndef _WX_XH_TOOLB_H_
 #define _WX_XH_TOOLB_H_
 
 #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"
 
 #include "wx/xrc/xmlres.h"
 

-#if wxUSE_TOOLBAR
+#if wxUSE_XRC && wxUSE_TOOLBAR

 
 

-class WXDLLEXPORT wxToolBar;
+class WXDLLIMPEXP_FWD_CORE wxToolBar;

 
 class WXDLLIMPEXP_XRC wxToolBarXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxToolBarXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler)
+

 public:
     wxToolBarXmlHandler();
     virtual wxObject *DoCreateResource();
 public:
     wxToolBarXmlHandler();
     virtual wxObject *DoCreateResource();


@@ -32,8 +29,9 @@ public:
 private:
     bool m_isInside;
     wxToolBar *m_toolbar;
 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_