Close tree edit even if the change is vetoed to be consistent with MSW [patch 1110252]

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

diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp
index 1450db585709ac7d268d222bb86b9f54bccbfc01..dababb288fed4c878ba31ec84756c3f208493f16 100644 (file)
--- a/src/xrc/xh_scwin.cpp
+++ b/src/xrc/xh_scwin.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2002 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "xh_scwin.h"
 #endif
 
@@ -19,21 +19,30 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC
+
 #include "wx/xrc/xh_scwin.h"
 #include "wx/scrolwin.h"
+#include "wx/frame.h"  // to get wxNO_3D
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindowXmlHandler, wxXmlResourceHandler)
 
-wxScrolledWindowXmlHandler::wxScrolledWindowXmlHandler() 
-: wxXmlResourceHandler() 
+wxScrolledWindowXmlHandler::wxScrolledWindowXmlHandler()
+: wxXmlResourceHandler()
 {
     XRC_ADD_STYLE(wxHSCROLL);
     XRC_ADD_STYLE(wxVSCROLL);
+
+    // wxPanel styles
+    XRC_ADD_STYLE(wxNO_3D);
+    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
+    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+
     AddWindowStyles();
 }
 
 wxObject *wxScrolledWindowXmlHandler::DoCreateResource()
-{ 
+{
     XRC_MAKE_INSTANCE(control, wxScrolledWindow)
 
     control->Create(m_parentAsWindow,
@@ -43,7 +52,8 @@ wxObject *wxScrolledWindowXmlHandler::DoCreateResource()
                     GetName());
 
     SetupWindow(control);
-    
+    CreateChildren(control);
+
     return control;
 }
 
@@ -51,3 +61,5 @@ bool wxScrolledWindowXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxScrolledWindow"));
 }
+
+#endif // wxUSE_XRC