xti additions / changes, trying to reduce dependencies

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

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index 84ad0389ec7f1c7e02b4bf0ee1299dcb6faf4fe0..66af5ffcf7438bd9435e34244aff00ff6785c1a3 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "colordlg.h"
 #endif
 
@@ -42,9 +42,7 @@
     #include "wx/msgdlg.h"
 #endif
 
-#if wxUSE_COLOURDLG
-
-#include <windows.h>
+#if wxUSE_COLOURDLG && !wxUSE_SMARTPHONE
 
 #include "wx/msw/private.h"
 #include "wx/colordlg.h"