renamed wxMotif::wxTLW::DoCreate() to XmDoCreateTLW() to avoid conflicts with

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

diff --git a/src/xrc/xh_scrol.cpp b/src/xrc/xh_scrol.cpp
index dd330bb78b0d25296faded9d38afdec399fa96af..7d8ae347281edb71089250948ff5f4403169456f 100644 (file)
--- a/src/xrc/xh_scrol.cpp
+++ b/src/xrc/xh_scrol.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "xh_scrol.h"
 #endif
 
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_SCROLLBAR
 
 #include "wx/xrc/xh_scrol.h"
 #include "wx/scrolbar.h"
@@ -61,4 +61,4 @@ bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxScrollBar"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_SCROLLBAR