Unicode fixes. Appears that this may be the last before wxMSW will link

[wxWidgets.git] / src / msw / colordlg.cpp

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index 3bc03e60994c3cdd1e0ede1f75a887d56eb1223f..c79f438df923900f3c143e530d7a0fb4e569078b 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -36,7 +36,7 @@
 
 #include <windows.h>
 
 
 #include <windows.h>
 

-#ifndef __WIN32__
+#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)

 #include <commdlg.h>
 #endif
 
 #include <commdlg.h>
 #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);
       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;
 
     chooseColorStruct.rgbResult = RGB(m_colourData.dataColour.Red(), m_colourData.dataColour.Green(), m_colourData.dataColour.Blue());
     chooseColorStruct.lpCustColors = custColours;