check that wxString is valid before dumping it

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

diff --git a/src/xrc/xh_gauge.cpp b/src/xrc/xh_gauge.cpp
index 852f7bbd654afa35e4650505b4116e7a6f05df9f..55e42a744cb7461d0794633f2fc69ab2c9932b93 100644 (file)
--- a/src/xrc/xh_gauge.cpp
+++ b/src/xrc/xh_gauge.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

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

 #pragma implementation "xh_gauge.h"
 #endif
 
 #pragma implementation "xh_gauge.h"
 #endif
 


@@ -19,15 +19,15 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC && wxUSE_GAUGE
+

 #include "wx/xrc/xh_gauge.h"
 #include "wx/gauge.h"
 
 #include "wx/xrc/xh_gauge.h"
 #include "wx/gauge.h"
 

-#if wxUSE_GAUGE
-

 IMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler)
 
 IMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler)
 

-wxGaugeXmlHandler::wxGaugeXmlHandler() 
-: wxXmlResourceHandler() 
+wxGaugeXmlHandler::wxGaugeXmlHandler()
+: wxXmlResourceHandler()

 {
     XRC_ADD_STYLE(wxGA_HORIZONTAL);
     XRC_ADD_STYLE(wxGA_VERTICAL);
 {
     XRC_ADD_STYLE(wxGA_HORIZONTAL);
     XRC_ADD_STYLE(wxGA_VERTICAL);


@@ -37,12 +37,12 @@ wxGaugeXmlHandler::wxGaugeXmlHandler()
 }
 
 wxObject *wxGaugeXmlHandler::DoCreateResource()
 }
 
 wxObject *wxGaugeXmlHandler::DoCreateResource()

-{ 
+{

     XRC_MAKE_INSTANCE(control, wxGauge)
 
     control->Create(m_parentAsWindow,
                     GetID(),
     XRC_MAKE_INSTANCE(control, wxGauge)
 
     control->Create(m_parentAsWindow,
                     GetID(),

-                    GetLong(wxT("range"), wxGAUGE_DEFAULT_RANGE), 
+                    GetLong(wxT("range"), wxGAUGE_DEFAULT_RANGE),

                     GetPosition(), GetSize(),
                     GetStyle(),
                     wxDefaultValidator,
                     GetPosition(), GetSize(),
                     GetStyle(),
                     wxDefaultValidator,


@@ -71,4 +71,4 @@ bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxGauge"));
 }
 
     return IsOfClass(node, wxT("wxGauge"));
 }
 

-#endif // wxUSE_GAUGE
+#endif // wxUSE_XRC && wxUSE_GAUGE