use correct scale when drawing

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

diff --git a/src/osx/carbon/colordlgosx.mm b/src/osx/carbon/colordlgosx.mm
index a8649d14c7c2a704f632756a9738308bd8c5610c..278f9ec9cdca6a1df9b7acb9cf1ecfd42d1d8269 100644 (file)
--- a/src/osx/carbon/colordlgosx.mm
+++ b/src/osx/carbon/colordlgosx.mm
@@ -22,7 +22,7 @@
 
 #include "wx/colordlg.h"
 #include "wx/fontdlg.h"
 
 #include "wx/colordlg.h"
 #include "wx/fontdlg.h"

-#include "wx/testing.h"
+#include "wx/modalhook.h"

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -106,6 +106,7 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
     NSAutoreleasePool *thePool;
     thePool = [[NSAutoreleasePool alloc] init];
 
     NSAutoreleasePool *thePool;
     thePool = [[NSAutoreleasePool alloc] init];
 

+    [[NSColorPanel sharedColorPanel] setShowsAlpha:YES];

     if(m_colourData.GetColour().IsOk())
         [[NSColorPanel sharedColorPanel] setColor:
             [NSColor colorWithCalibratedRed:(CGFloat) (m_colourData.GetColour().Red() / 255.0)
     if(m_colourData.GetColour().IsOk())
         [[NSColorPanel sharedColorPanel] setColor:
             [NSColor colorWithCalibratedRed:(CGFloat) (m_colourData.GetColour().Red() / 255.0)


@@ -123,7 +124,7 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
 }
 int wxColourDialog::ShowModal()
 {
 }
 int wxColourDialog::ShowModal()
 {

-    WX_TESTING_SHOW_MODAL_HOOK();
+    WX_HOOK_MODAL_DIALOG();

 
     //Start the pool.  Required for carbon interaction
     //(For those curious, the only thing that happens
 
     //Start the pool.  Required for carbon interaction
     //(For those curious, the only thing that happens