Fix install_name_tool calls in OS X "make install".

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

diff --git a/src/osx/carbon/colordlg.cpp b/src/osx/carbon/colordlg.cpp
index 377276d0c4e42631522d236234ddc9187d722817..191286f6b169ad61f068ed2740281143ade460e2 100644 (file)
--- a/src/osx/carbon/colordlg.cpp
+++ b/src/osx/carbon/colordlg.cpp
@@ -1,26 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        colordlg.cpp
+// Name:        src/osx/carbon/colordlg.cpp

 // Purpose:     wxColourDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Purpose:     wxColourDialog class. NOTE: you can use the generic class
 //              if you wish, instead of implementing this.
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 // Copyright:   (c) Stefan Csomor
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 

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

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

+#include "wx/modalhook.h"

 
 
 #if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 
 
 
 #if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
 
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 

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

 
 /*
  * wxColourDialog
 
 /*
  * wxColourDialog


@@ -47,19 +47,23 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 
 int wxColourDialog::ShowModal()
 {
 
 int wxColourDialog::ShowModal()
 {

+    WX_HOOK_MODAL_DIALOG();
+

     RGBColor currentColor ;
     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.theColor.color.rgb.blue =  currentColor.blue ;
     info.flags = kColorPickerDialogIsMoveable | kColorPickerDialogIsModal ;
     info.theColor.color.rgb.red =  currentColor.red ;
     info.theColor.color.rgb.green =  currentColor.green ;
     info.theColor.color.rgb.blue =  currentColor.blue ;

+    wxDialog::OSXBeginModalDialog();

     err = NPickColor(&info);
     err = NPickColor(&info);

+    wxDialog::OSXEndModalDialog();

     if ((err == noErr) && info.newColorChosen)
     {
         currentColor.red = info.theColor.color.rgb.red ;
     if ((err == noErr) && info.newColorChosen)
     {
         currentColor.red = info.theColor.color.rgb.red ;