Replaced id with winid so it doesn't conflict with the Objective-C type

[wxWidgets.git] / include / wx / univ / combobox.h

diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index b77d6405647f7a5e1bf467f169f5ce24a8610f13..c92cea953e0972e90295a3c5836f06604bd957d0 100644 (file)
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -36,7 +36,7 @@
 #ifndef _WX_UNIV_COMBOBOX_H_
 #define _WX_UNIV_COMBOBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "univcombobox.h"
 #endif