diff --git a/src/xrc/xh_odcombo.cpp b/src/xrc/xh_odcombo.cpp
index df1ece9ef3..ffd08373ef 100644
--- a/src/xrc/xh_odcombo.cpp
+++ b/src/xrc/xh_odcombo.cpp
@@ -106,14 +106,23 @@ wxObject *wxOwnerDrawnComboBoxXmlHandler::DoCreateResource()
 
 bool wxOwnerDrawnComboBoxXmlHandler::CanHandle(wxXmlNode *node)
 {
-//  Avoid GCC bug - this fails on certain GCC 3.x builds for an unknown reason
-//  return (IsOfClass(node, wxT("wxOwnerDrawnComboBox")) ||
-//         (m_insideBox && node->GetName() == wxT("item")));
+#if wxABI_VERSION >= 20700
+
+    return (IsOfClass(node, wxT("wxOwnerDrawnComboBox")) ||
+           (m_insideBox && node->GetName() == wxT("item")));
+
+#else
+
+//  Avoid GCC bug - this fails on certain GCC 3.3 and 3.4 builds for an unknown reason
+//  it is believed to be related to the fact IsOfClass is inline, and node->GetPropVal
+//  gets passed an invalid "this" pointer. On 2.7, the function is out of line, so the
+//  above should work fine. This code is left in here so this file can easily be used
+//  in a version backported to 2.6. All we are doing here is expanding the macro
 
     bool fOurClass = node->GetPropVal(wxT("class"), wxEmptyString) == wxT("wxOwnerDrawnComboBox");
     return (fOurClass ||
           (m_insideBox && node->GetName() == wxT("item")));
-
+#endif
 }
 
 #endif // wxUSE_XRC && wxUSE_ODCOMBOBOX