Use GetCursorPos on WinCE wherever possible (otherwise the wrong

[wxWidgets.git] / src / mac / carbon / colordlg.cpp

diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp
index 7f1dcbfbef2e186f5f9ea0e2ba783eee677365e4..bea3f01b823cd7caf26898e6655668201d9e1d77 100644 (file)
--- a/src/mac/carbon/colordlg.cpp
+++ b/src/mac/carbon/colordlg.cpp
@@ -7,14 +7,20 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWidgets licence
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "colordlg.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/mac/colordlg.h"
+#include "wx/fontdlg.h"
+
+
+#if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
@@ -68,3 +74,4 @@ int wxColourDialog::ShowModal()
     return wxID_CANCEL;
 }
 
+#endif