X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6869b469c6ba4a549b2bd463ce9778915781b0df..54e660f85e8525cc0d0cb0ca7a5c01f931e3ed62:/src/msw/colordlg.cpp diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index d95667925a..f369f4762b 100644 --- a/src/msw/colordlg.cpp +++ b/src/msw/colordlg.cpp @@ -77,7 +77,7 @@ wxColourDialogHookProc(HWND hwnd, { CHOOSECOLOR *pCC = (CHOOSECOLOR *)lParam; wxColourDialog * const - dialog = wx_reinterpret_cast(wxColourDialog *, pCC->lCustData); + dialog = reinterpret_cast(pCC->lCustData); const wxString title = dialog->GetTitle(); if ( !title.empty() ) @@ -161,7 +161,7 @@ int wxColourDialog::ShowModal() // transfer the values chosen by user back into m_colourData for ( i = 0; i < WXSIZEOF(custColours); i++ ) { - wxRGBToColour(m_colourData.GetCustomColour(i), custColours[i]); + wxRGBToColour(m_colourData.m_custColours[i], custColours[i]); } wxRGBToColour(m_colourData.GetColour(), chooseColorStruct.rgbResult);