/////////////////////////////////////////////////////////////////////////////
-// Name: generic/colrdlgg.cpp
+// Name: src/generic/colrdlgg.cpp
// Purpose: Choice dialogs
// Author: Julian Smart
// Modified by:
#include "wx/layout.h"
#include "wx/dcclient.h"
#include "wx/sizer.h"
+ #include "wx/slider.h"
#endif
#if wxUSE_STATLINE
#include "wx/statline.h"
#endif
-#if wxUSE_SLIDER
- #include "wx/slider.h"
-#endif
-
#include "wx/generic/colrdlgg.h"
IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
wxGenericColourDialog::wxGenericColourDialog()
{
- dialogParent = NULL;
- whichKind = 1;
- colourSelection = -1;
+ dialogParent = NULL;
+ whichKind = 1;
+ colourSelection = -1;
}
wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent,
wxColourData *data)
{
- whichKind = 1;
- colourSelection = -1;
- Create(parent, data);
+ whichKind = 1;
+ colourSelection = -1;
+ Create(parent, data);
}
wxGenericColourDialog::~wxGenericColourDialog()
void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{
- EndModal(wxID_CANCEL);
+ EndModal(wxID_CANCEL);
}
bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
int wxGenericColourDialog::ShowModal()
{
- return wxDialog::ShowModal();
+ return wxDialog::ShowModal();
}
void wxGenericColourDialog::CalculateMeasurements()
{
- smallRectangleSize.x = 18;
- smallRectangleSize.y = 14;
- customRectangleSize.x = 40;
- customRectangleSize.y = 40;
+ smallRectangleSize.x = 18;
+ smallRectangleSize.y = 14;
+ customRectangleSize.x = 40;
+ customRectangleSize.y = 40;
- gridSpacing = 6;
- sectionSpacing = 15;
+ gridSpacing = 6;
+ sectionSpacing = 15;
- standardColoursRect.x = 10;
+ standardColoursRect.x = 10;
#ifdef __WXPM__
- standardColoursRect.y = 15 + 20; /* OS/2 needs to account for dialog titlebar */
+ standardColoursRect.y = 15 + 20; /* OS/2 needs to account for dialog titlebar */
#else
- standardColoursRect.y = 15;
+ 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;
+ 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;
}
void wxGenericColourDialog::CreateWidgets()
const int sliderHeight = 160;
+ // first sliders
#if wxUSE_SLIDER
const int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing;
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 );
+
+ wxSizerFlags flagsRight;
+ flagsRight.Align(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL).DoubleBorder();
+
+ sliderSizer->Add(redSlider, flagsRight);
+ sliderSizer->Add(greenSlider,flagsRight);
+ sliderSizer->Add(blueSlider,flagsRight);
- topSizer->Add( sliderSizer, 0, wxCENTRE | wxALL, 10 );
+ topSizer->Add(sliderSizer, wxSizerFlags().Centre().DoubleBorder());
#else
- topSizer->Add( 1, sliderHeight, 0, wxCENTRE | wxALL, 15 );
+ topSizer->Add(1, sliderHeight, wxSizerFlags(1).Centre().TripleBorder());
#endif // wxUSE_SLIDER
-#if wxUSE_STATLINE
- // 2) static line
- topSizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
-#endif
+ // then the custom button
+ topSizer->Add(new wxButton(this, wxID_ADD_CUSTOM,
+ _("Add to custom colours") ),
+ wxSizerFlags().DoubleHorzBorder());
- // 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, wxEXPAND | wxALL, 10 );
+ // then the standard buttons
+ wxSizer *buttonsizer = CreateSeparatedButtonSizer(wxOK | wxCANCEL);
+ if ( buttonsizer )
+ {
+ topSizer->Add(buttonsizer, wxSizerFlags().Expand().DoubleBorder());
+ }
SetAutoLayout( true );
SetSizer( topSizer );
void wxGenericColourDialog::PaintBasicColours(wxDC& dc)
{
- 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*(smallRectangleSize.x+gridSpacing) + standardColoursRect.x);
+ int y = (i*(smallRectangleSize.y+gridSpacing) + standardColoursRect.y);
- dc.SetPen(*wxBLACK_PEN);
- wxBrush brush(standardColours[ptr], wxSOLID);
- dc.SetBrush(brush);
+ dc.SetPen(*wxBLACK_PEN);
+ wxBrush brush(standardColours[ptr], wxSOLID);
+ dc.SetBrush(brush);
- dc.DrawRectangle( x, y, smallRectangleSize.x, smallRectangleSize.y);
+ dc.DrawRectangle( x, y, smallRectangleSize.x, smallRectangleSize.y);
+ }
}
- }
}
void wxGenericColourDialog::PaintCustomColours(wxDC& dc)
void wxGenericColourDialog::PaintCustomColour(wxDC& dc)
{
- dc.SetPen(*wxBLACK_PEN);
+ dc.SetPen(*wxBLACK_PEN);
- wxBrush *brush = new wxBrush(colourData.m_dataColour, wxSOLID);
- dc.SetBrush(*brush);
+ wxBrush *brush = new wxBrush(colourData.m_dataColour, wxSOLID);
+ dc.SetBrush(*brush);
- dc.DrawRectangle( singleCustomColourRect.x, singleCustomColourRect.y,
- customRectangleSize.x, customRectangleSize.y);
+ dc.DrawRectangle( singleCustomColourRect.x, singleCustomColourRect.y,
+ customRectangleSize.x, customRectangleSize.y);
- dc.SetBrush(wxNullBrush);
- delete brush;
+ dc.SetBrush(wxNullBrush);
+ delete brush;
}
void wxGenericColourDialog::OnBasicColourClick(int which)
projects / wxWidgets.git / blobdiff