Removed all duplicated and complicated #ifdefs for enabling Skip and Abort in progres...

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

diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp
index 90326e713df188d7f5098afc1d00f174da85c9fa..6ca035476126cca94163014c5e3ecfdb283b56d6 100644 (file)
--- a/src/mac/carbon/colordlg.cpp
+++ b/src/mac/carbon/colordlg.cpp
@@ -2,12 +2,12 @@
 // Name:        colordlg.cpp
 // Purpose:     wxColourDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -15,12 +15,19 @@
 #endif
 
 #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__
+#include <ColorPicker.h>
+#endif
 
 /*
  * wxColourDialog
@@ -47,21 +54,22 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 
 int wxColourDialog::ShowModal()
 {
-       Point where ;
-       RGBColor currentColor = *((RGBColor*)m_colourData.dataColour.GetPixel()) , newColor ;
-       
-       where.h = where.v = -1;
+    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 ))
-       {
-               m_colourData.dataColour.Set( (WXCOLORREF*) &newColor ) ;
-       return wxID_OK;
-       }
-       else
-       {
-       return wxID_CANCEL;
-       }
+    if (GetColor( where, "\pSelect a new palette color.", &currentColor, &newColor ))
+    {
+        m_colourData.m_dataColour.Set( (WXCOLORREF*) &newColor ) ;
+        return wxID_OK;
+    }
+    else
+    {
+        return wxID_CANCEL;
+    }
 
     return wxID_CANCEL;
 }
 
+#endif