Warning fix.

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

diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp
index d71a11d752056658e0dc86c1f82303bcacacd957..6b6a467e19e7b675d75a38cf26ea2569bb503bb9 100644 (file)
--- a/src/xrc/xh_panel.cpp
+++ b/src/xrc/xh_panel.cpp
@@ -7,7 +7,7 @@
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
+

 #ifdef __GNUG__
 #pragma implementation "xh_panel.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "xh_panel.h"
 #endif


@@ -19,8 +19,11 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/xrc/xh_panel.h"
 #include "wx/panel.h"
 #include "wx/xrc/xh_panel.h"
 #include "wx/panel.h"

+#include "wx/frame.h"  // to get wxNO_3D

 
 IMPLEMENT_DYNAMIC_CLASS(wxPanelXmlHandler, wxXmlResourceHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxPanelXmlHandler, wxXmlResourceHandler)
 


@@ -29,12 +32,12 @@ wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);

-    XRC_ADD_STYLE(wxCLIP_CHILDREN);
+    

     AddWindowStyles();
 }
 
 wxObject *wxPanelXmlHandler::DoCreateResource()
     AddWindowStyles();
 }
 
 wxObject *wxPanelXmlHandler::DoCreateResource()

-{ 
+{

     XRC_MAKE_INSTANCE(panel, wxPanel)
 
     panel->Create(m_parentAsWindow,
     XRC_MAKE_INSTANCE(panel, wxPanel)
 
     panel->Create(m_parentAsWindow,


@@ -45,7 +48,7 @@ wxObject *wxPanelXmlHandler::DoCreateResource()
 
     SetupWindow(panel);
     CreateChildren(panel);
 
     SetupWindow(panel);
     CreateChildren(panel);

-    
+

     return panel;
 }
 
     return panel;
 }
 


@@ -53,3 +56,5 @@ bool wxPanelXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxPanel"));
 }
 {
     return IsOfClass(node, wxT("wxPanel"));
 }

+
+#endif // wxUSE_XRC