Compilation fix for unix builds with cygwin

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

diff --git a/src/xrc/xh_stlin.cpp b/src/xrc/xh_stlin.cpp
index 340dc4e945799beb5cd7bf03c6a318d4c8f5995b..c0edceee1c1db07d7e270239eaf67b892ae4bf5a 100644 (file)
--- a/src/xrc/xh_stlin.cpp
+++ b/src/xrc/xh_stlin.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

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

 #pragma implementation "xh_stlin.h"
 #endif
 
 #pragma implementation "xh_stlin.h"
 #endif
 


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

+#if wxUSE_XRC && wxUSE_STATLINE
+

 #include "wx/xrc/xh_stlin.h"
 #include "wx/statline.h"
 
 #include "wx/xrc/xh_stlin.h"
 #include "wx/statline.h"
 

-#if wxUSE_STATLINE
+IMPLEMENT_DYNAMIC_CLASS(wxStaticLineXmlHandler, wxXmlResourceHandler)

 
 

-wxStaticLineXmlHandler::wxStaticLineXmlHandler() 
-: wxXmlResourceHandler() 
+wxStaticLineXmlHandler::wxStaticLineXmlHandler()
+: wxXmlResourceHandler()

 {
     XRC_ADD_STYLE(wxLI_HORIZONTAL);
     XRC_ADD_STYLE(wxLI_VERTICAL);
 {
     XRC_ADD_STYLE(wxLI_HORIZONTAL);
     XRC_ADD_STYLE(wxLI_VERTICAL);


@@ -33,7 +35,7 @@ wxStaticLineXmlHandler::wxStaticLineXmlHandler()
 }
 
 wxObject *wxStaticLineXmlHandler::DoCreateResource()
 }
 
 wxObject *wxStaticLineXmlHandler::DoCreateResource()

-{ 
+{

     XRC_MAKE_INSTANCE(line, wxStaticLine)
 
     line->Create(m_parentAsWindow,
     XRC_MAKE_INSTANCE(line, wxStaticLine)
 
     line->Create(m_parentAsWindow,


@@ -43,7 +45,7 @@ wxObject *wxStaticLineXmlHandler::DoCreateResource()
                 GetName());
 
     SetupWindow(line);
                 GetName());
 
     SetupWindow(line);

-    
+

     return line;
 }
 
     return line;
 }
 


@@ -52,4 +54,4 @@ bool wxStaticLineXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStaticLine"));
 }
 
     return IsOfClass(node, wxT("wxStaticLine"));
 }
 

-#endif
+#endif // wxUSE_XRC && wxUSE_STATLINE