adapting to new m_font handling in base (it's not always valid, so use GetFont())

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

diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp
index 6948802acd1a38d2f42271d5b1f51b6d6997d2a2..377276d0c4e42631522d236234ddc9187d722817 100644 (file)
--- a/src/mac/carbon/colordlg.cpp
+++ b/src/mac/carbon/colordlg.cpp
@@ -21,9 +21,6 @@
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 
 #include "wx/mac/private.h"
-#ifndef __DARWIN__
-#include <ColorPicker.h>
-#endif
 
 /*
  * wxColourDialog
@@ -50,9 +47,9 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 
 int wxColourDialog::ShowModal()
 {
-    RGBColor currentColor = *((RGBColor*)m_colourData.m_dataColour.GetPixel()) ;
-
-#if TARGET_API_MAC_OSX
+    RGBColor currentColor ;
+    
+    m_colourData.m_dataColour.GetRGBColor( currentColor );
     NColorPickerInfo info;
     OSStatus err ;
     memset(&info, 0, sizeof(info)) ;
@@ -72,18 +69,6 @@ int wxColourDialog::ShowModal()
 
         return wxID_OK;
     }
-#else
-    RGBColor newColor ;
-    Point where ;
-
-    where.h = where.v = -1;
-
-    if (GetColor( where, "\pSelect a new palette color.", &currentColor, &newColor ))
-    {
-        m_colourData.m_dataColour.Set( (WXCOLORREF*) &newColor ) ;
-        return wxID_OK;
-    }
-#endif
     return wxID_CANCEL;
 }