1. wxDialogs are now destroyed when they go out of scope

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

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index df7bd24b0b1b5d36cb9fb4ecfa6017ffb9241b27..c79f438df923900f3c143e530d7a0fb4e569078b 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -23,8 +23,10 @@
 #ifndef WX_PRECOMP
 #include <stdio.h>
 #include "wx/defs.h"
+#include "wx/bitmap.h"
 #include "wx/pen.h"
 #include "wx/brush.h"
+#include "wx/colour.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"
 #include "wx/frame.h"
@@ -34,7 +36,7 @@
 
 #include <windows.h>
 
-#ifndef __WIN32__
+#if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
 #include <commdlg.h>
 #endif
 
@@ -87,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;