resolving conflicts in files I had forgot to commit (sorry)

[wxWidgets.git] / src / msw / gdiobj.cpp

diff --git a/src/msw/gdiobj.cpp b/src/msw/gdiobj.cpp
index 8a2e9e16fa05d29bd688690ad757af1c9ade60a3..de94cd9d544bf0f3926dbb395128f8c02ce66d5c 100644 (file)
--- a/src/msw/gdiobj.cpp
+++ b/src/msw/gdiobj.cpp
@@ -9,7 +9,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "gdiobj.h"
 #endif