X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/adf9e09990c79a3645eaa1f69b44d852c11a72f0..56f69d54faea99a58828c2077c42fccc1303e490:/src/msw/colordlg.cpp diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index ea313873c3..706e220ae7 100644 --- a/src/msw/colordlg.cpp +++ b/src/msw/colordlg.cpp @@ -129,12 +129,12 @@ int wxColourDialog::ShowModal() int i; for (i = 0; i < 16; i++) - custColours[i] = wxColourToRGB(m_colourData.custColours[i]); + custColours[i] = wxColourToRGB(m_colourData.m_custColours[i]); chooseColorStruct.lStructSize = sizeof(CHOOSECOLOR); if ( m_parent ) chooseColorStruct.hwndOwner = GetHwndOf(m_parent); - chooseColorStruct.rgbResult = wxColourToRGB(m_colourData.dataColour); + chooseColorStruct.rgbResult = wxColourToRGB(m_colourData.m_dataColour); chooseColorStruct.lpCustColors = custColours; chooseColorStruct.Flags = CC_RGBINIT | CC_ENABLEHOOK; @@ -160,10 +160,10 @@ int wxColourDialog::ShowModal() // Restore values for (i = 0; i < 16; i++) { - wxRGBToColour(m_colourData.custColours[i], custColours[i]); + wxRGBToColour(m_colourData.m_custColours[i], custColours[i]); } - wxRGBToColour(m_colourData.dataColour, chooseColorStruct.rgbResult); + wxRGBToColour(m_colourData.m_dataColour, chooseColorStruct.rgbResult); return success ? wxID_OK : wxID_CANCEL; }