AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no real changes: just some cleanup, better error handling and (unsuccessful) attemps to retrieve CC_FULLOPEN value from the dialog

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-11-18 19:25:14 +00:00
parent 910c0f44dc
commit 2349ba4cf9
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/msw/colordlg.cpp
View File

@ -116,14 +116,17 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
int wxColourDialog::ShowModal()
{
// initialize the struct used by Windows
CHOOSECOLOR chooseColorStruct;
COLORREF custColours[16];
memset(&chooseColorStruct, 0, sizeof(CHOOSECOLOR));
int i;
for (i = 0; i < 16; i++)
// and transfer data from m_colourData to it
COLORREF custColours[16];
for ( i = 0; i < WXSIZEOF(custColours); i++ )
{
if (m_colourData.m_custColours[i].Ok())
if ( m_colourData.m_custColours[i].IsOk() )
custColours[i] = wxColourToRGB(m_colourData.m_custColours[i]);
else
custColours[i] = RGB(255,255,255);
@ -139,30 +142,36 @@ int wxColourDialog::ShowModal()
chooseColorStruct.lCustData = (LPARAM)this;
chooseColorStruct.lpfnHook = wxColourDialogHookProc;
if (m_colourData.GetChooseFull())
if ( m_colourData.GetChooseFull() )
chooseColorStruct.Flags |= CC_FULLOPEN;
// Do the modal dialog
bool success = ::ChooseColor(&(chooseColorStruct)) != 0;
// Try to highlight the correct window (the parent)
if (GetParent())
// do show the modal dialog
if ( !::ChooseColor(&chooseColorStruct) )
{
HWND hWndParent = (HWND) GetParent()->GetHWND();
if (hWndParent)
::BringWindowToTop(hWndParent);
// 0 error means the dialog was simply cancelled, i.e. no real error
// occurred
const DWORD err = CommDlgExtendedError();
if ( err )
wxLogError(_("Colour selection dialog failed with error %0lx."), err);
return wxID_CANCEL;
}
// Restore values
for (i = 0; i < 16; i++)
// transfer the values chosen by user back into m_colourData
for ( i = 0; i < WXSIZEOF(custColours); i++ )
{
wxRGBToColour(m_colourData.m_custColours[i], custColours[i]);
}
wxRGBToColour(m_colourData.m_dataColour, chooseColorStruct.rgbResult);
return success ? wxID_OK : wxID_CANCEL;
// this doesn't seem to work (contrary to what MSDN implies) on current
// Windows versions: CC_FULLOPEN is never set on return if it wasn't
// initially set and vice versa
//m_colourData.SetChooseFull((chooseColorStruct.Flags & CC_FULLOPEN) != 0);
return wxID_OK;
}
// ----------------------------------------------------------------------------