Simplified and extended compiler detection for OS/2.

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

diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp
index fa72c134cc65fc87aed6699de9cc8c7a51e3b582..837633de09ea15f4c347319b040abbceaebb3f90 100644 (file)
--- a/src/xrc/xh_combo.cpp
+++ b/src/xrc/xh_combo.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "xh_combo.h"
 #endif
 
 #pragma implementation "xh_combo.h"
 #endif
 


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

-#if wxUSE_XML && wxUSE_XRC && wxUSE_COMBOBOX
+#if wxUSE_XRC && wxUSE_COMBOBOX

 
 #include "wx/xrc/xh_combo.h"
 #include "wx/combobox.h"
 
 #include "wx/xrc/xh_combo.h"
 #include "wx/combobox.h"


@@ -100,4 +100,4 @@ bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node)
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
            (m_insideBox && node->GetName() == wxT("item")));
 }
 

-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_COMBOBOX
+#endif // wxUSE_XRC && wxUSE_COMBOBOX