X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2432b92dd7a837db13d3938a56c1959decd03203..86fdd27b451ec92f4573f125fec73c44421ee744:/src/msw/colordlg.cpp diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index 3bc03e6099..78a01e7dde 100644 --- a/src/msw/colordlg.cpp +++ b/src/msw/colordlg.cpp @@ -36,7 +36,7 @@ #include -#ifndef __WIN32__ +#if !defined(__WIN32__) || defined(__SALFORDC__) #include #endif @@ -89,7 +89,7 @@ int wxColourDialog::ShowModal(void) custColours[i] = RGB(m_colourData.custColours[i].Red(), m_colourData.custColours[i].Green(), m_colourData.custColours[i].Blue()); chooseColorStruct.lStructSize = sizeof(CHOOSECOLOR); - chooseColorStruct.hwndOwner = (HWND) (m_dialogParent ? (HWND) m_dialogParent->GetHWND() : NULL); + chooseColorStruct.hwndOwner = (HWND) (m_dialogParent ? (HWND) m_dialogParent->GetHWND() : (HWND) NULL); chooseColorStruct.rgbResult = RGB(m_colourData.dataColour.Red(), m_colourData.dataColour.Green(), m_colourData.dataColour.Blue()); chooseColorStruct.lpCustColors = custColours;