Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug where color chosen by sliders wouldn't be registered. Optimized a bit.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2004-11-18 16:24:11 +00:00
parent 1e72e3cc53
commit dc2ee831d3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/generic/colrdlgg.cpp
View File

@@ -161,7 +161,9 @@ bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
int wxGenericColourDialog::ShowModal() int wxGenericColourDialog::ShowModal()
{ {
return wxDialog::ShowModal(); int nResult = wxDialog::ShowModal();
colourData.SetColour(singleCustomColour);
return nResult;
} }
@@ -483,7 +485,6 @@ void wxGenericColourDialog::OnBasicColourClick(int which)
PaintHighlight(dc, false); PaintHighlight(dc, false);
whichKind = 1; whichKind = 1;
colourSelection = which; colourSelection = which;
colourData.SetColour(standardColours[colourSelection]);
redSlider->SetValue( standardColours[colourSelection].Red() ); redSlider->SetValue( standardColours[colourSelection].Red() );
greenSlider->SetValue( standardColours[colourSelection].Green() ); greenSlider->SetValue( standardColours[colourSelection].Green() );
blueSlider->SetValue( standardColours[colourSelection].Blue() ); blueSlider->SetValue( standardColours[colourSelection].Blue() );
@@ -499,7 +500,6 @@ void wxGenericColourDialog::OnCustomColourClick(int which)
PaintHighlight(dc, false); PaintHighlight(dc, false);
whichKind = 2; whichKind = 2;
colourSelection = which; colourSelection = which;
colourData.SetColour(customColours[colourSelection]);
redSlider->SetValue( customColours[colourSelection].Red() ); redSlider->SetValue( customColours[colourSelection].Red() );
greenSlider->SetValue( customColours[colourSelection].Green() ); greenSlider->SetValue( customColours[colourSelection].Green() );
blueSlider->SetValue( customColours[colourSelection].Blue() ); blueSlider->SetValue( customColours[colourSelection].Blue() );
@@ -533,7 +533,6 @@ void wxGenericColourDialog::OnAddCustom(wxCommandEvent& WXUNUSED(event))
} }
customColours[colourSelection].Set(singleCustomColour.Red(), singleCustomColour.Green(), singleCustomColour.Blue()); customColours[colourSelection].Set(singleCustomColour.Red(), singleCustomColour.Green(), singleCustomColour.Blue());
colourData.SetColour(customColours[colourSelection]);
colourData.SetCustomColour(colourSelection, customColours[colourSelection]); colourData.SetCustomColour(colourSelection, customColours[colourSelection]);
PaintCustomColours(dc); PaintCustomColours(dc);