X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/984b0d8ba7ccace8dd84fb12710e44b2a9ec51fa..bc9d3d911cfb51f612a699d7fb00f57eb5b2097c:/src/generic/colrdlgg.cpp diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index 7207f2927c..49e4bb6a45 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: generic/colrdlgg.cpp +// Name: src/generic/colrdlgg.cpp // Purpose: Choice dialogs // Author: Julian Smart // Modified by: @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "colrdlgg.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -20,7 +16,7 @@ #pragma hdrstop #endif -#if wxUSE_COLOURDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__)) +#if wxUSE_COLOURDLG #ifndef WX_PRECOMP #include "wx/utils.h" @@ -31,23 +27,26 @@ #include "wx/stattext.h" #include "wx/layout.h" #include "wx/dcclient.h" - #include "wx/slider.h" #include "wx/sizer.h" + #include "wx/slider.h" #endif #if wxUSE_STATLINE #include "wx/statline.h" #endif +#include "wx/colourdata.h" #include "wx/generic/colrdlgg.h" IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog) BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog) EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom) +#if wxUSE_SLIDER EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider) EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider) EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider) +#endif EVT_PAINT(wxGenericColourDialog::OnPaint) EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent) EVT_CLOSE(wxGenericColourDialog::OnCloseWindow) @@ -60,7 +59,7 @@ END_EVENT_TABLE() // don't change the number of elements (48) in this array, the code below is // hardcoded to use it -static const wxChar *wxColourDialogNames[] = +static const wxChar *const wxColourDialogNames[] = { wxT("ORANGE"), wxT("GOLDENROD"), @@ -119,17 +118,16 @@ static const wxChar *wxColourDialogNames[] = wxGenericColourDialog::wxGenericColourDialog() { - dialogParent = NULL; - whichKind = 1; - colourSelection = -1; + m_whichKind = 1; + m_colourSelection = -1; } wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent, wxColourData *data) { - whichKind = 1; - colourSelection = -1; - Create(parent, data); + m_whichKind = 1; + m_colourSelection = -1; + Create(parent, data); } wxGenericColourDialog::~wxGenericColourDialog() @@ -138,19 +136,18 @@ wxGenericColourDialog::~wxGenericColourDialog() void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) { - EndModal(wxID_CANCEL); + EndModal(wxID_CANCEL); } bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data) { - if ( !wxDialog::Create(parent, wxID_ANY, _("Choose colour"), + if ( !wxDialog::Create(GetParentForModalDialog(parent, 0), wxID_ANY, + _("Choose colour"), wxPoint(0, 0), wxSize(900, 900)) ) return false; - dialogParent = parent; - if (data) - colourData = *data; + m_colourData = *data; InitializeColours(); CalculateMeasurements(); @@ -161,7 +158,7 @@ bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data) int wxGenericColourDialog::ShowModal() { - return wxDialog::ShowModal(); + return wxDialog::ShowModal(); } @@ -180,19 +177,19 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event) GetClientSize(NULL, &nClientHeight); y = (nClientHeight - y) + 20; #endif - if ((x >= standardColoursRect.x && x <= (standardColoursRect.x + standardColoursRect.width)) && - (y >= standardColoursRect.y && y <= (standardColoursRect.y + standardColoursRect.height))) + if ((x >= m_standardColoursRect.x && x <= (m_standardColoursRect.x + m_standardColoursRect.width)) && + (y >= m_standardColoursRect.y && y <= (m_standardColoursRect.y + m_standardColoursRect.height))) { - int selX = (int)(x - standardColoursRect.x)/(smallRectangleSize.x + gridSpacing); - int selY = (int)(y - standardColoursRect.y)/(smallRectangleSize.y + gridSpacing); + int selX = (int)(x - m_standardColoursRect.x)/(m_smallRectangleSize.x + m_gridSpacing); + int selY = (int)(y - m_standardColoursRect.y)/(m_smallRectangleSize.y + m_gridSpacing); int ptr = (int)(selX + selY*8); OnBasicColourClick(ptr); } - else if ((x >= customColoursRect.x && x <= (customColoursRect.x + customColoursRect.width)) && - (y >= customColoursRect.y && y <= (customColoursRect.y + customColoursRect.height))) + else if ((x >= m_customColoursRect.x && x <= (m_customColoursRect.x + m_customColoursRect.width)) && + (y >= m_customColoursRect.y && y <= (m_customColoursRect.y + m_customColoursRect.height))) { - int selX = (int)(x - customColoursRect.x)/(smallRectangleSize.x + gridSpacing); - int selY = (int)(y - customColoursRect.y)/(smallRectangleSize.y + gridSpacing); + int selX = (int)(x - m_customColoursRect.x)/(m_smallRectangleSize.x + m_gridSpacing); + int selY = (int)(y - m_customColoursRect.y)/(m_smallRectangleSize.y + m_gridSpacing); int ptr = (int)(selX + selY*8); OnCustomColourClick(ptr); } @@ -203,89 +200,96 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event) event.Skip(); } -void wxGenericColourDialog::OnPaint(wxPaintEvent& event) +void wxGenericColourDialog::OnPaint(wxPaintEvent& WXUNUSED(event)) { -#if !defined(__WXMOTIF__) && !defined(__WXMAC__) && !defined(__WXPM__) && !defined(__WXCOCOA__) - wxDialog::OnPaint(event); -#endif - - wxPaintDC dc(this); + wxPaintDC dc(this); - PaintBasicColours(dc); - PaintCustomColours(dc); - PaintCustomColour(dc); - PaintHighlight(dc, true); + PaintBasicColours(dc); + PaintCustomColours(dc); + PaintCustomColour(dc); + PaintHighlight(dc, true); } void wxGenericColourDialog::CalculateMeasurements() { - smallRectangleSize.x = 18; - smallRectangleSize.y = 14; - customRectangleSize.x = 40; - customRectangleSize.y = 40; + m_smallRectangleSize.x = 18; + m_smallRectangleSize.y = 14; + m_customRectangleSize.x = 40; + m_customRectangleSize.y = 40; - gridSpacing = 6; - sectionSpacing = 15; + m_gridSpacing = 6; + m_sectionSpacing = 15; - standardColoursRect.x = 10; + m_standardColoursRect.x = 10; #ifdef __WXPM__ - standardColoursRect.y = 15 + 20; /* OS/2 needs to account for dialog titlebar */ + m_standardColoursRect.y = 15 + 20; /* OS/2 needs to account for dialog titlebar */ #else - standardColoursRect.y = 15; + m_standardColoursRect.y = 15; #endif - standardColoursRect.width = (8*smallRectangleSize.x) + (7*gridSpacing); - standardColoursRect.height = (6*smallRectangleSize.y) + (5*gridSpacing); - - customColoursRect.x = standardColoursRect.x; - customColoursRect.y = standardColoursRect.y + standardColoursRect.height + 20; - customColoursRect.width = (8*smallRectangleSize.x) + (7*gridSpacing); - customColoursRect.height = (2*smallRectangleSize.y) + (1*gridSpacing); - - singleCustomColourRect.x = customColoursRect.width + customColoursRect.x + sectionSpacing; - singleCustomColourRect.y = 80; - singleCustomColourRect.width = customRectangleSize.x; - singleCustomColourRect.height = customRectangleSize.y; - - okButtonX = 10; - customButtonX = singleCustomColourRect.x ; - buttonY = customColoursRect.y + customColoursRect.height + 10; + m_standardColoursRect.width = (8*m_smallRectangleSize.x) + (7*m_gridSpacing); + m_standardColoursRect.height = (6*m_smallRectangleSize.y) + (5*m_gridSpacing); + + m_customColoursRect.x = m_standardColoursRect.x; + m_customColoursRect.y = m_standardColoursRect.y + m_standardColoursRect.height + 20; + m_customColoursRect.width = (8*m_smallRectangleSize.x) + (7*m_gridSpacing); + m_customColoursRect.height = (2*m_smallRectangleSize.y) + (1*m_gridSpacing); + + m_singleCustomColourRect.x = m_customColoursRect.width + m_customColoursRect.x + m_sectionSpacing; + m_singleCustomColourRect.y = 80; + m_singleCustomColourRect.width = m_customRectangleSize.x; + m_singleCustomColourRect.height = m_customRectangleSize.y; + + m_okButtonX = 10; + m_customButtonX = m_singleCustomColourRect.x ; + m_buttonY = m_customColoursRect.y + m_customColoursRect.height + 10; } void wxGenericColourDialog::CreateWidgets() { wxBeginBusyCursor(); - const int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing; + wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL ); + const int sliderHeight = 160; - redSlider = new wxSlider(this, wxID_RED_SLIDER, colourData.m_dataColour.Red(), 0, 255, - wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxVERTICAL|wxSL_LABELS); - greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, colourData.m_dataColour.Green(), 0, 255, - wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxVERTICAL|wxSL_LABELS); - blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, colourData.m_dataColour.Blue(), 0, 255, - wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxVERTICAL|wxSL_LABELS); + // first sliders +#if wxUSE_SLIDER + const int sliderX = m_singleCustomColourRect.x + m_singleCustomColourRect.width + m_sectionSpacing; + + m_redSlider = new wxSlider(this, wxID_RED_SLIDER, m_colourData.m_dataColour.Red(), 0, 255, + wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE); + m_greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, m_colourData.m_dataColour.Green(), 0, 255, + wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE); + m_blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, m_colourData.m_dataColour.Blue(), 0, 255, + wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE); wxBoxSizer *sliderSizer = new wxBoxSizer( wxHORIZONTAL ); - // 1) space for sliders - sliderSizer->Add( sliderX, sliderHeight ); - sliderSizer->Add( redSlider, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL, 10 ); - sliderSizer->Add( greenSlider, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL, 10 ); - sliderSizer->Add( blueSlider, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL, 10 ); + sliderSizer->Add(sliderX, sliderHeight ); - wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL ); + wxSizerFlags flagsRight; + flagsRight.Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL).DoubleBorder(); - topSizer->Add( sliderSizer, 0, wxCENTRE | wxALL, 10 ); + sliderSizer->Add(m_redSlider, flagsRight); + sliderSizer->Add(m_greenSlider,flagsRight); + sliderSizer->Add(m_blueSlider,flagsRight); -#if wxUSE_STATLINE - // 2) static line - topSizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 ); -#endif + topSizer->Add(sliderSizer, wxSizerFlags().Centre().DoubleBorder()); +#else + topSizer->Add(1, sliderHeight, wxSizerFlags(1).Centre().TripleBorder()); +#endif // wxUSE_SLIDER - // 3) buttons - wxSizer *buttonsizer = CreateButtonSizer( wxOK|wxCANCEL ); - buttonsizer->Add( new wxButton(this, wxID_ADD_CUSTOM, _("Add to custom colours") ), 0, wxLEFT|wxRIGHT, 10 ); - topSizer->Add( buttonsizer, 0, wxCENTRE | wxALL, 10 ); + // then the custom button + topSizer->Add(new wxButton(this, wxID_ADD_CUSTOM, + _("Add to custom colours") ), + wxSizerFlags().DoubleHorzBorder()); + + // then the standard buttons + wxSizer *buttonsizer = CreateSeparatedButtonSizer(wxOK | wxCANCEL); + if ( buttonsizer ) + { + topSizer->Add(buttonsizer, wxSizerFlags().Expand().DoubleBorder()); + } SetAutoLayout( true ); SetSizer( topSizer ); @@ -305,87 +309,82 @@ void wxGenericColourDialog::InitializeColours(void) for (i = 0; i < WXSIZEOF(wxColourDialogNames); i++) { wxColour col = wxTheColourDatabase->Find(wxColourDialogNames[i]); - if (col.Ok()) - standardColours[i].Set(col.Red(), col.Green(), col.Blue()); + if (col.IsOk()) + m_standardColours[i].Set(col.Red(), col.Green(), col.Blue()); else - standardColours[i].Set(0, 0, 0); + m_standardColours[i].Set(0, 0, 0); } - for (i = 0; i < WXSIZEOF(customColours); i++) + for (i = 0; i < WXSIZEOF(m_customColours); i++) { - wxColour c = colourData.GetCustomColour(i); - if (c.Ok()) - customColours[i] = colourData.GetCustomColour(i); + wxColour c = m_colourData.GetCustomColour(i); + if (c.IsOk()) + m_customColours[i] = m_colourData.GetCustomColour(i); else - customColours[i] = wxColour(255, 255, 255); + m_customColours[i] = wxColour(255, 255, 255); } - wxColour curr = colourData.GetColour(); - if ( curr.Ok() ) + wxColour curr = m_colourData.GetColour(); + if ( curr.IsOk() ) { - bool initColourFound = false; + bool m_initColourFound = false; for (i = 0; i < WXSIZEOF(wxColourDialogNames); i++) { - if ( standardColours[i] == curr && !initColourFound ) + if ( m_standardColours[i] == curr && !m_initColourFound ) { - whichKind = 1; - colourSelection = i; - initColourFound = true; + m_whichKind = 1; + m_colourSelection = i; + m_initColourFound = true; break; } } - if ( !initColourFound ) + if ( !m_initColourFound ) { - for ( i = 0; i < WXSIZEOF(customColours); i++ ) + for ( i = 0; i < WXSIZEOF(m_customColours); i++ ) { - if ( customColours[i] == curr ) + if ( m_customColours[i] == curr ) { - whichKind = 2; - colourSelection = i; + m_whichKind = 2; + m_colourSelection = i; break; } } } - colourData.m_dataColour.Set( curr.Red(), curr.Green(), curr.Blue() ); + m_colourData.m_dataColour.Set( curr.Red(), curr.Green(), curr.Blue() ); } else { - whichKind = 1; - colourSelection = 0; - colourData.m_dataColour.Set( 0, 0, 0 ); + m_whichKind = 1; + m_colourSelection = 0; + m_colourData.m_dataColour.Set( 0, 0, 0 ); } } void wxGenericColourDialog::PaintBasicColours(wxDC& dc) { - dc.BeginDrawing(); - - int i; - for (i = 0; i < 6; i++) - { - int j; - for (j = 0; j < 8; j++) + int i; + for (i = 0; i < 6; i++) { - int ptr = i*8 + j; + int j; + for (j = 0; j < 8; j++) + { + int ptr = i*8 + j; - int x = (j*(smallRectangleSize.x+gridSpacing) + standardColoursRect.x); - int y = (i*(smallRectangleSize.y+gridSpacing) + standardColoursRect.y); + int x = (j*(m_smallRectangleSize.x+m_gridSpacing) + m_standardColoursRect.x); + int y = (i*(m_smallRectangleSize.y+m_gridSpacing) + m_standardColoursRect.y); - dc.SetPen(*wxBLACK_PEN); - wxBrush brush(standardColours[ptr], wxSOLID); - dc.SetBrush(brush); + dc.SetPen(*wxBLACK_PEN); + wxBrush brush(m_standardColours[ptr]); + dc.SetBrush(brush); - dc.DrawRectangle( x, y, smallRectangleSize.x, smallRectangleSize.y); + dc.DrawRectangle( x, y, m_smallRectangleSize.x, m_smallRectangleSize.y); + } } - } - dc.EndDrawing(); } void wxGenericColourDialog::PaintCustomColours(wxDC& dc) { - dc.BeginDrawing(); - int i; for (i = 0; i < 2; i++) { @@ -394,40 +393,37 @@ void wxGenericColourDialog::PaintCustomColours(wxDC& dc) { int ptr = i*8 + j; - int x = (j*(smallRectangleSize.x+gridSpacing)) + customColoursRect.x; - int y = (i*(smallRectangleSize.y+gridSpacing)) + customColoursRect.y; + int x = (j*(m_smallRectangleSize.x+m_gridSpacing)) + m_customColoursRect.x; + int y = (i*(m_smallRectangleSize.y+m_gridSpacing)) + m_customColoursRect.y; dc.SetPen(*wxBLACK_PEN); - wxBrush brush(customColours[ptr], wxSOLID); + wxBrush brush(m_customColours[ptr]); dc.SetBrush(brush); - dc.DrawRectangle( x, y, smallRectangleSize.x, smallRectangleSize.y); + dc.DrawRectangle( x, y, m_smallRectangleSize.x, m_smallRectangleSize.y); } } - dc.EndDrawing(); } void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw) { - if ( colourSelection < 0 ) + if ( m_colourSelection < 0 ) return; - dc.BeginDrawing(); - // Number of pixels bigger than the standard rectangle size // for drawing a highlight int deltaX = 2; int deltaY = 2; - if (whichKind == 1) + if (m_whichKind == 1) { // Standard colours - int y = (int)(colourSelection / 8); - int x = (int)(colourSelection - (y*8)); + int y = (int)(m_colourSelection / 8); + int x = (int)(m_colourSelection - (y*8)); - x = (x*(smallRectangleSize.x + gridSpacing) + standardColoursRect.x) - deltaX; - y = (y*(smallRectangleSize.y + gridSpacing) + standardColoursRect.y) - deltaY; + x = (x*(m_smallRectangleSize.x + m_gridSpacing) + m_standardColoursRect.x) - deltaX; + y = (y*(m_smallRectangleSize.y + m_gridSpacing) + m_standardColoursRect.y) - deltaY; if (draw) dc.SetPen(*wxBLACK_PEN); @@ -435,16 +431,16 @@ void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw) dc.SetPen(*wxLIGHT_GREY_PEN); dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawRectangle( x, y, (smallRectangleSize.x + (2*deltaX)), (smallRectangleSize.y + (2*deltaY))); + dc.DrawRectangle( x, y, (m_smallRectangleSize.x + (2*deltaX)), (m_smallRectangleSize.y + (2*deltaY))); } else { // User-defined colours - int y = (int)(colourSelection / 8); - int x = (int)(colourSelection - (y*8)); + int y = (int)(m_colourSelection / 8); + int x = (int)(m_colourSelection - (y*8)); - x = (x*(smallRectangleSize.x + gridSpacing) + customColoursRect.x) - deltaX; - y = (y*(smallRectangleSize.y + gridSpacing) + customColoursRect.y) - deltaY; + x = (x*(m_smallRectangleSize.x + m_gridSpacing) + m_customColoursRect.x) - deltaX; + y = (y*(m_smallRectangleSize.y + m_gridSpacing) + m_customColoursRect.y) - deltaY; if (draw) dc.SetPen(*wxBLACK_PEN); @@ -452,28 +448,22 @@ void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw) dc.SetPen(*wxLIGHT_GREY_PEN); dc.SetBrush(*wxTRANSPARENT_BRUSH); - dc.DrawRectangle( x, y, (smallRectangleSize.x + (2*deltaX)), (smallRectangleSize.y + (2*deltaY))); + dc.DrawRectangle( x, y, (m_smallRectangleSize.x + (2*deltaX)), (m_smallRectangleSize.y + (2*deltaY))); } - - dc.EndDrawing(); } void wxGenericColourDialog::PaintCustomColour(wxDC& dc) { - dc.BeginDrawing(); - - dc.SetPen(*wxBLACK_PEN); + dc.SetPen(*wxBLACK_PEN); - wxBrush *brush = new wxBrush(colourData.m_dataColour, wxSOLID); - dc.SetBrush(*brush); + wxBrush *brush = new wxBrush(m_colourData.m_dataColour); + dc.SetBrush(*brush); - dc.DrawRectangle( singleCustomColourRect.x, singleCustomColourRect.y, - customRectangleSize.x, customRectangleSize.y); + dc.DrawRectangle( m_singleCustomColourRect.x, m_singleCustomColourRect.y, + m_customRectangleSize.x, m_customRectangleSize.y); - dc.SetBrush(wxNullBrush); - delete brush; - - dc.EndDrawing(); + dc.SetBrush(wxNullBrush); + delete brush; } void wxGenericColourDialog::OnBasicColourClick(int which) @@ -481,16 +471,18 @@ void wxGenericColourDialog::OnBasicColourClick(int which) wxClientDC dc(this); PaintHighlight(dc, false); - whichKind = 1; - colourSelection = which; - - redSlider->SetValue( standardColours[colourSelection].Red() ); - greenSlider->SetValue( standardColours[colourSelection].Green() ); - blueSlider->SetValue( standardColours[colourSelection].Blue() ); - - colourData.m_dataColour.Set(standardColours[colourSelection].Red(), - standardColours[colourSelection].Green(), - standardColours[colourSelection].Blue()); + m_whichKind = 1; + m_colourSelection = which; + +#if wxUSE_SLIDER + m_redSlider->SetValue( m_standardColours[m_colourSelection].Red() ); + m_greenSlider->SetValue( m_standardColours[m_colourSelection].Green() ); + m_blueSlider->SetValue( m_standardColours[m_colourSelection].Blue() ); +#endif // wxUSE_SLIDER + + m_colourData.m_dataColour.Set(m_standardColours[m_colourSelection].Red(), + m_standardColours[m_colourSelection].Green(), + m_standardColours[m_colourSelection].Blue()); PaintCustomColour(dc); PaintHighlight(dc, true); @@ -500,17 +492,19 @@ void wxGenericColourDialog::OnCustomColourClick(int which) { wxClientDC dc(this); PaintHighlight(dc, false); - whichKind = 2; - colourSelection = which; - - redSlider->SetValue( customColours[colourSelection].Red() ); - greenSlider->SetValue( customColours[colourSelection].Green() ); - blueSlider->SetValue( customColours[colourSelection].Blue() ); - - colourData.m_dataColour.Set(customColours[colourSelection].Red(), - customColours[colourSelection].Green(), - customColours[colourSelection].Blue()); - + m_whichKind = 2; + m_colourSelection = which; + +#if wxUSE_SLIDER + m_redSlider->SetValue( m_customColours[m_colourSelection].Red() ); + m_greenSlider->SetValue( m_customColours[m_colourSelection].Green() ); + m_blueSlider->SetValue( m_customColours[m_colourSelection].Blue() ); +#endif // wxUSE_SLIDER + + m_colourData.m_dataColour.Set(m_customColours[m_colourSelection].Red(), + m_customColours[m_colourSelection].Green(), + m_customColours[m_colourSelection].Blue()); + PaintCustomColour(dc); PaintHighlight(dc, true); } @@ -531,52 +525,55 @@ void wxGenericColourDialog::OnCancel(void) void wxGenericColourDialog::OnAddCustom(wxCommandEvent& WXUNUSED(event)) { wxClientDC dc(this); - if (whichKind != 2) + if (m_whichKind != 2) { PaintHighlight(dc, false); - whichKind = 2; - colourSelection = 0; + m_whichKind = 2; + m_colourSelection = 0; PaintHighlight(dc, true); } - customColours[colourSelection].Set(colourData.m_dataColour.Red(), - colourData.m_dataColour.Green(), - colourData.m_dataColour.Blue()); - - colourData.SetCustomColour(colourSelection, customColours[colourSelection]); + m_customColours[m_colourSelection].Set(m_colourData.m_dataColour.Red(), + m_colourData.m_dataColour.Green(), + m_colourData.m_dataColour.Blue()); + + m_colourData.SetCustomColour(m_colourSelection, m_customColours[m_colourSelection]); PaintCustomColours(dc); } +#if wxUSE_SLIDER + void wxGenericColourDialog::OnRedSlider(wxCommandEvent& WXUNUSED(event)) { - if (!redSlider) + if (!m_redSlider) return; wxClientDC dc(this); - colourData.m_dataColour.Set((unsigned char)redSlider->GetValue(), colourData.m_dataColour.Green(), colourData.m_dataColour.Blue()); + m_colourData.m_dataColour.Set((unsigned char)m_redSlider->GetValue(), m_colourData.m_dataColour.Green(), m_colourData.m_dataColour.Blue()); PaintCustomColour(dc); } void wxGenericColourDialog::OnGreenSlider(wxCommandEvent& WXUNUSED(event)) { - if (!greenSlider) + if (!m_greenSlider) return; wxClientDC dc(this); - colourData.m_dataColour.Set(colourData.m_dataColour.Red(), (unsigned char)greenSlider->GetValue(), colourData.m_dataColour.Blue()); + m_colourData.m_dataColour.Set(m_colourData.m_dataColour.Red(), (unsigned char)m_greenSlider->GetValue(), m_colourData.m_dataColour.Blue()); PaintCustomColour(dc); } void wxGenericColourDialog::OnBlueSlider(wxCommandEvent& WXUNUSED(event)) { - if (!blueSlider) + if (!m_blueSlider) return; wxClientDC dc(this); - colourData.m_dataColour.Set(colourData.m_dataColour.Red(), colourData.m_dataColour.Green(), (unsigned char)blueSlider->GetValue()); + m_colourData.m_dataColour.Set(m_colourData.m_dataColour.Red(), m_colourData.m_dataColour.Green(), (unsigned char)m_blueSlider->GetValue()); PaintCustomColour(dc); } -#endif // wxUSE_COLOURDLG && !defined(__WXGTK20__) +#endif // wxUSE_SLIDER +#endif // wxUSE_COLOURDLG