X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..cd5e9298159e58f57e05f3b76c9d4a45e1eefe12:/src/mac/carbon/colordlg.cpp

diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp
index e91938f8ad..b8df2bcc5a 100644
--- a/src/mac/carbon/colordlg.cpp
+++ b/src/mac/carbon/colordlg.cpp
@@ -16,7 +16,14 @@
 
 #include "wx/mac/colordlg.h"
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
+#endif
+
+#include "wx/mac/private.h"
+#ifndef __DARWIN__
+#include <ColorPicker.h>
+#endif
 
 /*
  * wxColourDialog
@@ -44,13 +51,13 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 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 ))
 	{
-		m_colourData.dataColour.Set( newColor ) ;
+		m_colourData.dataColour.Set( (WXCOLORREF*) &newColor ) ;
     	return wxID_OK;
 	}
 	else