Add ellipsization support to wxDataViewCtrl.

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

diff --git a/src/osx/carbon/colordlg.cpp b/src/osx/carbon/colordlg.cpp
index 377276d0c4e42631522d236234ddc9187d722817..6ec1b9e15a9fb637b3d7689599bf12be9ec293d8 100644 (file)
--- a/src/osx/carbon/colordlg.cpp
+++ b/src/osx/carbon/colordlg.cpp
@@ -12,7 +12,7 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/mac/colordlg.h"
+#include "wx/osx/colordlg.h"

 #include "wx/fontdlg.h"
 
 
 #include "wx/fontdlg.h"
 
 


@@ -20,7 +20,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 

-#include "wx/mac/private.h"
+#include "wx/osx/private.h"

 
 /*
  * wxColourDialog
 
 /*
  * wxColourDialog


@@ -48,13 +48,13 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 int wxColourDialog::ShowModal()
 {
     RGBColor currentColor ;
 int wxColourDialog::ShowModal()
 {
     RGBColor currentColor ;

-    
-    m_colourData.m_dataColour.GetRGBColor( currentColor );
+
+    m_colourData.m_dataColour.GetRGBColor( &currentColor );

     NColorPickerInfo info;
     OSStatus err ;
     memset(&info, 0, sizeof(info)) ;
     // TODO : use parent to determine better position and then kAtSpecifiedOrigin
     NColorPickerInfo info;
     OSStatus err ;
     memset(&info, 0, sizeof(info)) ;
     // TODO : use parent to determine better position and then kAtSpecifiedOrigin

-    info.placeWhere = kCenterOnMainScreen ; 
+    info.placeWhere = kCenterOnMainScreen ;

     info.flags = kColorPickerDialogIsMoveable | kColorPickerDialogIsModal ;
     info.theColor.color.rgb.red =  currentColor.red ;
     info.theColor.color.rgb.green =  currentColor.green ;
     info.flags = kColorPickerDialogIsMoveable | kColorPickerDialogIsModal ;
     info.theColor.color.rgb.red =  currentColor.red ;
     info.theColor.color.rgb.green =  currentColor.green ;