improved memory liberation (explicitly set to NULL after delete)

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

diff --git a/src/mac/colordlg.cpp b/src/mac/colordlg.cpp
index c6037a9f964eb9959db27a0dc3f02957e76028e4..b8df2bcc5a302c5b1a61f77113575ed8a6a127ab 100644 (file)
--- a/src/mac/colordlg.cpp
+++ b/src/mac/colordlg.cpp
@@ -20,6 +20,11 @@
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 #endif
 

+#include "wx/mac/private.h"
+#ifndef __DARWIN__
+#include <ColorPicker.h>
+#endif
+

 /*
  * wxColourDialog
  */
 /*
  * wxColourDialog
  */


@@ -46,13 +51,13 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 int wxColourDialog::ShowModal()
 {
        Point where ;
 int wxColourDialog::ShowModal()
 {
        Point where ;

-       RGBColor currentColor = m_colourData.dataColour.GetPixel() , newColor ;
+       RGBColor currentColor = *((RGBColor*)m_colourData.dataColour.GetPixel()) , newColor ;

        
        where.h = where.v = -1;
 
        if (GetColor( where, "\pSelect a new palette color.", &currentColor, &newColor ))
        {
        
        where.h = where.v = -1;
 
        if (GetColor( where, "\pSelect a new palette color.", &currentColor, &newColor ))
        {

-               m_colourData.dataColour.Set( newColor ) ;
+               m_colourData.dataColour.Set( (WXCOLORREF*) &newColor ) ;

        return wxID_OK;
        }
        else
        return wxID_OK;
        }
        else