X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae500232a4e961a567a5fb375fcf4f4a23216bd2..62f864c32c53356b7228591c85b14abc491c46f0:/src/mac/carbon/colordlg.cpp

diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp
index 3c8411319b..6c542fdcfb 100644
--- a/src/mac/carbon/colordlg.cpp
+++ b/src/mac/carbon/colordlg.cpp
@@ -10,15 +10,19 @@
 // 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)
-#endif
 
 #include "wx/mac/private.h"
 #ifndef __DARWIN__
@@ -42,17 +46,17 @@ wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data)
 bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 {
     m_dialogParent = parent;
-  
+
     if (data)
         m_colourData = *data;
-    return TRUE;
+    return true;
 }
 
 int wxColourDialog::ShowModal()
 {
     Point where ;
     RGBColor currentColor = *((RGBColor*)m_colourData.m_dataColour.GetPixel()) , newColor ;
-    
+
     where.h = where.v = -1;
 
     if (GetColor( where, "\pSelect a new palette color.", &currentColor, &newColor ))
@@ -60,11 +64,8 @@ int wxColourDialog::ShowModal()
         m_colourData.m_dataColour.Set( (WXCOLORREF*) &newColor ) ;
         return wxID_OK;
     }
-    else
-    {
-        return wxID_CANCEL;
-    }
 
     return wxID_CANCEL;
 }
 
+#endif