merged both implementations of wxGenericDirCtrl

[wxWidgets.git] / include / wx / msw / ole / automtn.h

diff --git a/include/wx/msw/ole/automtn.h b/include/wx/msw/ole/automtn.h
index b3598a59858093bccdf0a6d3802ef216a9396059..9e35455a5433de2f683e08d1612ac7d7f37148e5 100644 (file)
--- a/include/wx/msw/ole/automtn.h
+++ b/include/wx/msw/ole/automtn.h
@@ -22,6 +22,10 @@
 typedef void            WXIDISPATCH;
 typedef unsigned short* WXBSTR;
 
 typedef void            WXIDISPATCH;
 typedef unsigned short* WXBSTR;
 

+#ifdef GetObject
+#undef GetObject
+#endif
+

 /*
  * wxAutomationObject
  * Wraps up an IDispatch pointer and invocation; does variant conversion.
 /*
  * wxAutomationObject
  * Wraps up an IDispatch pointer and invocation; does variant conversion.