Let wxMSW report wxDataViewCustomRenderer::LeftClick() report the click position...

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

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index d95667925a9ed31fd9de7f46b414de94185492f8..0b8d20706f05ec1fb910cd0c0ca760c02ac886cc 100644 (file)
--- 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<wxColourDialog *>(pCC->lCustData);
 
         const wxString title = dialog->GetTitle();
         if ( !title.empty() )
@@ -152,7 +152,9 @@ int wxColourDialog::ShowModal()
         // occurred
         const DWORD err = CommDlgExtendedError();
         if ( err )
+        {
             wxLogError(_("Colour selection dialog failed with error %0lx."), err);
+        }
 
         return wxID_CANCEL;
     }
@@ -161,7 +163,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);