]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/colordlg.cpp
workaround for blocking behaviour under carbon when running in classic
[wxWidgets.git] / src / msw / colordlg.cpp
index 706e220ae7ec369f353e751df76f2980d5b3b7c7..467b05a3cde72232cdbfdeb7614d068a6dc57030 100644 (file)
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "colordlg.h"
 #endif
 
     #include "wx/msgdlg.h"
 #endif
 
-#if wxUSE_COLOURDLG
-
-#include <windows.h>
-
-#if !defined(__WIN32__) || defined(__SALFORDC__)
-    #include <commdlg.h>
-#endif
+#if wxUSE_COLOURDLG && !wxUSE_SMARTPHONE
 
 #include "wx/msw/private.h"
 #include "wx/colordlg.h"
 #include "wx/cmndata.h"
 
+#if !defined(__WIN32__) || defined(__WXWINCE__)
+    #include <commdlg.h>
+#endif
+
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
@@ -72,10 +70,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 // colour dialog hook proc
 // ----------------------------------------------------------------------------
 
-UINT CALLBACK wxColourDialogHookProc(HWND hwnd,
-                                     UINT uiMsg,
-                                     WPARAM WXUNUSED(wParam),
-                                     LPARAM lParam)
+UINT_PTR CALLBACK
+wxColourDialogHookProc(HWND hwnd,
+                       UINT uiMsg,
+                       WPARAM WXUNUSED(wParam),
+                       LPARAM lParam)
 {
     if ( uiMsg == WM_INITDIALOG )
     {