Remove persistence related files ag

[wxWidgets.git] / src / osx / carbon / colordlgosx.mm

diff --git a/src/osx/carbon/colordlgosx.mm b/src/osx/carbon/colordlgosx.mm
index ea058c24f73200b10688b6d275fd0d7b7e06ab86..0dc098887ff7a811c11fb1c36ee03765e0a4581d 100644 (file)
--- a/src/osx/carbon/colordlgosx.mm
+++ b/src/osx/carbon/colordlgosx.mm
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/mac/carbon/colordlg.mm
+// Name:        src/osx/carbon/colordlg.mm
 // Purpose:     wxColourDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.
 // Author:      Ryan Norton
@@ -20,7 +20,7 @@
 
 #include "wx/wxprec.h"
 
-#include "wx/mac/colordlg.h"
+#include "wx/osx/colordlg.h"
 #include "wx/fontdlg.h"
 
 // ============================================================================
@@ -122,11 +122,11 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
     NSAutoreleasePool *thePool;
     thePool = [[NSAutoreleasePool alloc] init];
 
-    if(m_colourData.m_dataColour.Ok())
+    if(m_colourData.GetColour().IsOk())
         [[NSColorPanel sharedColorPanel] setColor:
-            [NSColor colorWithCalibratedRed:m_colourData.m_dataColour.Red() / 255.0
-                                        green:m_colourData.m_dataColour.Green() / 255.0
-                                        blue:m_colourData.m_dataColour.Blue() / 255.0
+            [NSColor colorWithCalibratedRed:m_colourData.GetColour().Red() / 255.0
+                                        green:m_colourData.GetColour().Green() / 255.0
+                                        blue:m_colourData.GetColour().Blue() / 255.0
                                         alpha:1.0]
         ];
     else
@@ -175,7 +175,7 @@ int wxColourDialog::ShowModal()
     //Get the shared color panel along with the chosen color and set the chosen color
     NSColor* theColor = [[theColorPanel color] colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
 
-    m_colourData.m_dataColour.Set(
+    m_colourData.GetColour().Set(
                                 (unsigned char) ([theColor redComponent] * 255.0),
                                 (unsigned char) ([theColor greenComponent] * 255.0),
                                 (unsigned char) ([theColor blueComponent] * 255.0)