Fix <object_ref> processing to respect overridden attributes.

[wxWidgets.git] / src / xrc / xh_stbox.cpp

diff --git a/src/xrc/xh_stbox.cpp b/src/xrc/xh_stbox.cpp
index a5df4e68f294a399e1224556c92230f4405342f7..a52688d5e10d97c31524e44d7c1c9ed5066f9e43 100644 (file)
--- a/src/xrc/xh_stbox.cpp
+++ b/src/xrc/xh_stbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_stbox.cpp
+// Name:        src/xrc/xh_stbox.cpp
 // Purpose:     XRC resource for wxStaticBox
 // Author:      Brian Gavin
 // Created:     2000/09/09
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xh_stbox.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,15 +15,18 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC
+#if wxUSE_XRC && wxUSE_STATBOX
 
 #include "wx/xrc/xh_stbox.h"
-#include "wx/statbox.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/statbox.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBoxXmlHandler, wxXmlResourceHandler)
 
 wxStaticBoxXmlHandler::wxStaticBoxXmlHandler()
-: wxXmlResourceHandler()
+                      :wxXmlResourceHandler()
 {
     AddWindowStyles();
 }
@@ -53,4 +52,4 @@ bool wxStaticBoxXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStaticBox"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_STATBOX