X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/975b6bcf9b134b950832a60fd2e845e5f1bcd6bf..a29b55cdf6c1f8547c615a5e928813ba78566e9a:/src/msw/colordlg.cpp diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index 467b05a3cd..b7bbd4fb77 100644 --- a/src/msw/colordlg.cpp +++ b/src/msw/colordlg.cpp @@ -42,7 +42,7 @@ #include "wx/msgdlg.h" #endif -#if wxUSE_COLOURDLG && !wxUSE_SMARTPHONE +#if wxUSE_COLOURDLG && !defined(__SMARTPHONE__) #include "wx/msw/private.h" #include "wx/colordlg.h" @@ -128,7 +128,12 @@ int wxColourDialog::ShowModal() int i; for (i = 0; i < 16; i++) - custColours[i] = wxColourToRGB(m_colourData.m_custColours[i]); + { + if (m_colourData.m_custColours[i].Ok()) + custColours[i] = wxColourToRGB(m_colourData.m_custColours[i]); + else + custColours[i] = RGB(255,255,255); + } chooseColorStruct.lStructSize = sizeof(CHOOSECOLOR); if ( m_parent ) @@ -147,10 +152,9 @@ int wxColourDialog::ShowModal() bool success = ::ChooseColor(&(chooseColorStruct)) != 0; // Try to highlight the correct window (the parent) - HWND hWndParent = 0; if (GetParent()) { - hWndParent = (HWND) GetParent()->GetHWND(); + HWND hWndParent = (HWND) GetParent()->GetHWND(); if (hWndParent) ::BringWindowToTop(hWndParent); }