Use wxMBConvUTF8 when G_FILENAME_ENCODING is UTF-8, and set

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

diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp
index ada2a31489f3d35c97ed8344051261e9bff67a88..d9ee3ad6d6cf1e655ef29e3d49dc4e14d9838fb9 100644 (file)
--- a/src/xrc/xh_tree.cpp
+++ b/src/xrc/xh_tree.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "xh_tree.h"
 #endif
 
@@ -19,12 +19,15 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_TREECTRL
+
 #include "wx/xrc/xh_tree.h"
 #include "wx/treectrl.h"
 
+IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrlXmlHandler, wxXmlResourceHandler)
 
-wxTreeCtrlXmlHandler::wxTreeCtrlXmlHandler() 
-: wxXmlResourceHandler() 
+wxTreeCtrlXmlHandler::wxTreeCtrlXmlHandler()
+: wxXmlResourceHandler()
 {
     XRC_ADD_STYLE(wxTR_EDIT_LABELS);
     XRC_ADD_STYLE(wxTR_NO_BUTTONS);
@@ -44,7 +47,7 @@ wxTreeCtrlXmlHandler::wxTreeCtrlXmlHandler()
 }
 
 wxObject *wxTreeCtrlXmlHandler::DoCreateResource()
-{ 
+{
     XRC_MAKE_INSTANCE(tree, wxTreeCtrl)
 
     tree->Create(m_parentAsWindow,
@@ -55,7 +58,7 @@ wxObject *wxTreeCtrlXmlHandler::DoCreateResource()
                 GetName());
 
     SetupWindow(tree);
-    
+
     return tree;
 }
 
@@ -63,3 +66,5 @@ bool wxTreeCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTreeCtrl"));
 }
+
+#endif // wxUSE_XRC && wxUSE_TREECTRL