X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e38077e6c9d2e5b9f6ab681c8632399958c1514..7ea1c917764fb2588fe1aadc75c49ba300f8cb2f:/src/generic/colrdlgg.cpp?ds=inline diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index 2c4766cbf9..a868d28d58 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -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" @@ -149,7 +145,7 @@ void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data) { if ( !wxDialog::Create(parent, wxID_ANY, _("Choose colour"), - wxPoint(), wxSize(900, 900)) ) + wxPoint(0,0), wxSize(900, 900)) ) return false; dialogParent = parent; @@ -211,15 +207,17 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event) void wxGenericColourDialog::OnPaint(wxPaintEvent& event) { #if !defined(__WXMOTIF__) && !defined(__WXPM__) && !defined(__WXCOCOA__) - wxDialog::OnPaint(event); + wxDialog::OnPaint(event); +#else + wxUnusedVar(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() @@ -268,11 +266,11 @@ void wxGenericColourDialog::CreateWidgets() const int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing; redSlider = new wxSlider(this, wxID_RED_SLIDER, colourData.m_dataColour.Red(), 0, 255, - wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxVERTICAL|wxSL_LABELS); + wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE); greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, colourData.m_dataColour.Green(), 0, 255, - wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxVERTICAL|wxSL_LABELS); + wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE); blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, colourData.m_dataColour.Blue(), 0, 255, - wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxVERTICAL|wxSL_LABELS); + wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE); wxBoxSizer *sliderSizer = new wxBoxSizer( wxHORIZONTAL ); @@ -369,8 +367,6 @@ void wxGenericColourDialog::InitializeColours(void) void wxGenericColourDialog::PaintBasicColours(wxDC& dc) { - dc.BeginDrawing(); - int i; for (i = 0; i < 6; i++) { @@ -389,13 +385,10 @@ void wxGenericColourDialog::PaintBasicColours(wxDC& dc) dc.DrawRectangle( x, y, smallRectangleSize.x, smallRectangleSize.y); } } - dc.EndDrawing(); } void wxGenericColourDialog::PaintCustomColours(wxDC& dc) { - dc.BeginDrawing(); - int i; for (i = 0; i < 2; i++) { @@ -415,7 +408,6 @@ void wxGenericColourDialog::PaintCustomColours(wxDC& dc) dc.DrawRectangle( x, y, smallRectangleSize.x, smallRectangleSize.y); } } - dc.EndDrawing(); } void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw) @@ -423,8 +415,6 @@ void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw) if ( colourSelection < 0 ) return; - dc.BeginDrawing(); - // Number of pixels bigger than the standard rectangle size // for drawing a highlight int deltaX = 2; @@ -464,14 +454,10 @@ void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw) dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.DrawRectangle( x, y, (smallRectangleSize.x + (2*deltaX)), (smallRectangleSize.y + (2*deltaY))); } - - dc.EndDrawing(); } void wxGenericColourDialog::PaintCustomColour(wxDC& dc) { - dc.BeginDrawing(); - dc.SetPen(*wxBLACK_PEN); wxBrush *brush = new wxBrush(colourData.m_dataColour, wxSOLID); @@ -482,8 +468,6 @@ void wxGenericColourDialog::PaintCustomColour(wxDC& dc) dc.SetBrush(wxNullBrush); delete brush; - - dc.EndDrawing(); } void wxGenericColourDialog::OnBasicColourClick(int which) @@ -597,4 +581,3 @@ void wxGenericColourDialog::OnBlueSlider(wxCommandEvent& WXUNUSED(event)) #endif // wxUSE_SLIDER #endif // wxUSE_COLOURDLG && !defined(__WXGTK20__) -