always properly check if SeekI() calls succeded; this makes CanRead() functions of...

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

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index d95667925a9ed31fd9de7f46b414de94185492f8..f369f4762be5335c07df7cedde7eac6ae50f3cd1 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
     {
         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() )
 
         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++ )
     {
     // 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);
     }
 
     wxRGBToColour(m_colourData.GetColour(), chooseColorStruct.rgbResult);