reintroducing direct access, cleanup

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

diff --git a/src/mac/carbon/colordlg.cpp b/src/mac/carbon/colordlg.cpp
index 134e40f445d2a60f13e5d72894b7f8fa70fe2124..bea3f01b823cd7caf26898e6655668201d9e1d77 100644 (file)
--- a/src/mac/carbon/colordlg.cpp
+++ b/src/mac/carbon/colordlg.cpp
@@ -10,11 +10,17 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "colordlg.h"
 #endif
 
 #pragma implementation "colordlg.h"
 #endif
 

+#include "wx/wxprec.h"
+

 #include "wx/mac/colordlg.h"
 #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)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)


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

-    RGBColor currentColor = *((RGBColor*)m_colourData.dataColour.GetPixel()) , newColor ;
+    RGBColor currentColor = *((RGBColor*)m_colourData.m_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( (WXCOLORREF*) &newColor ) ;
+        m_colourData.m_dataColour.Set( (WXCOLORREF*) &newColor ) ;

         return wxID_OK;
     }
     else
         return wxID_OK;
     }
     else


@@ -68,3 +74,4 @@ int wxColourDialog::ShowModal()
     return wxID_CANCEL;
 }
 
     return wxID_CANCEL;
 }
 

+#endif