Generalised WinCE fix for other platforms

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

diff --git a/src/xrc/xh_stbox.cpp b/src/xrc/xh_stbox.cpp
index 42b5e979677f1ebd9acc80a90cc48b3ef1d74f29..14ef930b6a6c4d107faf866c306d8f58835d8877 100644 (file)
--- a/src/xrc/xh_stbox.cpp
+++ b/src/xrc/xh_stbox.cpp
@@ -1,14 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbox.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_stbox.cpp

-// Purpose:     XML resource for wxStaticBox
+// Purpose:     XRC resource for wxStaticBox

 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Brian Gavin
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "xh_stbox.h"
 #endif
 
 #pragma implementation "xh_stbox.h"
 #endif
 


@@ -19,34 +19,38 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/xrc/xh_stbox.h"
 #include "wx/statbox.h"
 
 #include "wx/xrc/xh_stbox.h"
 #include "wx/statbox.h"
 

-wxStaticBoxXmlHandler::wxStaticBoxXmlHandler() 
-: wxXmlResourceHandler() 
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBoxXmlHandler, wxXmlResourceHandler)
+
+wxStaticBoxXmlHandler::wxStaticBoxXmlHandler()
+: wxXmlResourceHandler()

 {
     AddWindowStyles();
 }
 
 wxObject *wxStaticBoxXmlHandler::DoCreateResource()
 {
     AddWindowStyles();
 }
 
 wxObject *wxStaticBoxXmlHandler::DoCreateResource()

-{ 
-    wxStaticBox *box = new wxStaticBox(m_parentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("label")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    GetName()
-                                    );
+{
+    XRC_MAKE_INSTANCE(box, wxStaticBox)
+
+    box->Create(m_parentAsWindow,
+                GetID(),
+                GetText(wxT("label")),
+                GetPosition(), GetSize(),
+                GetStyle(),
+                GetName());
+

     SetupWindow(box);
     SetupWindow(box);

-    
+

     return box;
 }
 
     return box;
 }
 

-
-

 bool wxStaticBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxStaticBox"));
 }
 
 bool wxStaticBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxStaticBox"));
 }
 

-
+#endif // wxUSE_XRC