check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp
index 4109e33488ae94d2683282a0c32a972f68cccb10..bdb49c62c9d420e0ec7695ba7993a9ee2a4bea36 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"
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 
 #include "wx/mac/private.h"

-#ifndef __DARWIN__
-#include <ColorPicker.h>
-#endif

 
 /*
  * wxColourDialog
 
 /*
  * wxColourDialog


@@ -52,7 +49,6 @@ int wxColourDialog::ShowModal()
 {
     RGBColor currentColor = *((RGBColor*)m_colourData.m_dataColour.GetPixel()) ;
 
 {
     RGBColor currentColor = *((RGBColor*)m_colourData.m_dataColour.GetPixel()) ;
 

-#if TARGET_API_MAC_OSX

     NColorPickerInfo info;
     OSStatus err ;
     memset(&info, 0, sizeof(info)) ;
     NColorPickerInfo info;
     OSStatus err ;
     memset(&info, 0, sizeof(info)) ;


@@ -68,21 +64,10 @@ int wxColourDialog::ShowModal()
         currentColor.red = info.theColor.color.rgb.red ;
         currentColor.green = info.theColor.color.rgb.green ;
         currentColor.blue = info.theColor.color.rgb.blue ;
         currentColor.red = info.theColor.color.rgb.red ;
         currentColor.green = info.theColor.color.rgb.green ;
         currentColor.blue = info.theColor.color.rgb.blue ;

-        m_colourData.m_dataColour.Set((WXCOLORREF*) &currentColor);
-        return wxID_OK;
-    }
-#else
-    RGBColor newColor ;
-    Point where ;
+        m_colourData.m_dataColour = currentColor;

 
 

-    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;
     }
         return wxID_OK;
     }

-#endif

     return wxID_CANCEL;
 }
 
     return wxID_CANCEL;
 }