X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d485bda109d5ef0fef36a3f737549e9b9f54baab..ec2df34e27ba41f202ecbf096cdfed082a9ddb8f:/src/osx/carbon/colordlgosx.mm diff --git a/src/osx/carbon/colordlgosx.mm b/src/osx/carbon/colordlgosx.mm index a8649d14c7..278f9ec9cd 100644 --- 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/testing.h" +#include "wx/modalhook.h" // ============================================================================ // implementation @@ -106,6 +106,7 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) 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) @@ -123,7 +124,7 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) } 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