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

Include wx/slider.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-06-06 16:28:58 +00:00
parent bfeed34c1c
commit f4da9a9431
8 changed files with 76 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
src/generic/colrdlgg.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: generic/colrdlgg.cpp
// Name: src/generic/colrdlgg.cpp
// Purpose: Choice dialogs
// Author: Julian Smart
// Modified by:
@@ -28,16 +28,13 @@
#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)
@@ -120,17 +117,17 @@ static const wxChar *wxColourDialogNames[] =
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()
@@ -139,7 +136,7 @@ wxGenericColourDialog::~wxGenericColourDialog()
void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{
EndModal(wxID_CANCEL);
EndModal(wxID_CANCEL);
}
bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
@@ -162,7 +159,7 @@ bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
int wxGenericColourDialog::ShowModal()
{
return wxDialog::ShowModal();
return wxDialog::ShowModal();
}
@@ -222,36 +219,36 @@ void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
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);
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);
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;
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;
okButtonX = 10;
customButtonX = singleCustomColourRect.x ;
buttonY = customColoursRect.y + customColoursRect.height + 10;
}
void wxGenericColourDialog::CreateWidgets()
@@ -367,24 +364,24 @@ void wxGenericColourDialog::InitializeColours(void)
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)
@@ -458,16 +455,16 @@ void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw)
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)