use fallback encoding in wxConvAuto when input is not in UTF-8

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

diff --git a/src/xrc/xh_sttxt.cpp b/src/xrc/xh_sttxt.cpp
index e94e9fdbd254f0a89f3eae2fdeb315cd2ac1e1ed..229c5526f87c8b5827e3422f0c84bbd7e069511b 100644 (file)
--- a/src/xrc/xh_sttxt.cpp
+++ b/src/xrc/xh_sttxt.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_sttxt.cpp
+// Name:        src/xrc/xh_sttxt.cpp
 // Purpose:     XRC resource for wxStaticText
 // Author:      Bob Mitchell
 // Created:     2000/03/21
@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
- 
-#ifdef __GNUG__
-#pragma implementation "xh_sttxt.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -19,13 +15,18 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_XRC && wxUSE_STATTEXT
+
 #include "wx/xrc/xh_sttxt.h"
-#include "wx/stattext.h"
+
+#ifndef WX_PRECOMP
+   #include "wx/stattext.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticTextXmlHandler, wxXmlResourceHandler)
 
-wxStaticTextXmlHandler::wxStaticTextXmlHandler() 
-: wxXmlResourceHandler() 
+wxStaticTextXmlHandler::wxStaticTextXmlHandler()
+: wxXmlResourceHandler()
 {
     XRC_ADD_STYLE(wxST_NO_AUTORESIZE);
     XRC_ADD_STYLE(wxALIGN_LEFT);
@@ -35,18 +36,18 @@ wxStaticTextXmlHandler::wxStaticTextXmlHandler()
 }
 
 wxObject *wxStaticTextXmlHandler::DoCreateResource()
-{ 
+{
     XRC_MAKE_INSTANCE(text, wxStaticText)
 
     text->Create(m_parentAsWindow,
-                    GetID(),
-                    GetText(wxT("label")),
-                    GetPosition(), GetSize(),
-                    GetStyle(),
-                    GetName());
+                 GetID(),
+                 GetText(wxT("label")),
+                 GetPosition(), GetSize(),
+                 GetStyle(),
+                 GetName());
 
     SetupWindow(text);
-    
+
     return text;
 }
 
@@ -54,3 +55,5 @@ bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxStaticText"));
 }
+
+#endif // wxUSE_XRC && wxUSE_STATTEXT