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

10
src/cocoa/slider.mm
View File

@@ -1,26 +1,28 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: cocoa/slider.mm // Name: src/cocoa/slider.mm
// Purpose: wxSlider // Purpose: wxSlider
// Author: David Elliott // Author: David Elliott
// Modified by: // Modified by:
// Created: 2003/06/19 // Created: 2003/06/19
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott // Copyright: (c) 2003 David Elliott
// Licence: wxWidgets licence // Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h" #include "wx/wxprec.h"
#if wxUSE_SLIDER #if wxUSE_SLIDER
#include "wx/slider.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/app.h" #include "wx/app.h"
#include "wx/slider.h"
#endif //WX_PRECOMP #endif //WX_PRECOMP
#import <AppKit/NSSlider.h> #import <AppKit/NSSlider.h>
IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
BEGIN_EVENT_TABLE(wxSlider, wxSliderBase) BEGIN_EVENT_TABLE(wxSlider, wxSliderBase)
END_EVENT_TABLE() END_EVENT_TABLE()
// WX_IMPLEMENT_COCOA_OWNER(wxSlider,NSSlider,NSControl,NSView) // WX_IMPLEMENT_COCOA_OWNER(wxSlider,NSSlider,NSControl,NSView)

107
src/generic/colrdlgg.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: generic/colrdlgg.cpp // Name: src/generic/colrdlgg.cpp
// Purpose: Choice dialogs // Purpose: Choice dialogs
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
@@ -28,16 +28,13 @@
#include "wx/layout.h" #include "wx/layout.h"
#include "wx/dcclient.h" #include "wx/dcclient.h"
#include "wx/sizer.h" #include "wx/sizer.h"
#include "wx/slider.h"
#endif #endif
#if wxUSE_STATLINE #if wxUSE_STATLINE
#include "wx/statline.h" #include "wx/statline.h"
#endif #endif
#if wxUSE_SLIDER
#include "wx/slider.h"
#endif
#include "wx/generic/colrdlgg.h" #include "wx/generic/colrdlgg.h"
IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog) IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
@@ -120,17 +117,17 @@ static const wxChar *wxColourDialogNames[] =
wxGenericColourDialog::wxGenericColourDialog() wxGenericColourDialog::wxGenericColourDialog()
{ {
dialogParent = NULL; dialogParent = NULL;
whichKind = 1; whichKind = 1;
colourSelection = -1; colourSelection = -1;
} }
wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent, wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent,
wxColourData *data) wxColourData *data)
{ {
whichKind = 1; whichKind = 1;
colourSelection = -1; colourSelection = -1;
Create(parent, data); Create(parent, data);
} }
wxGenericColourDialog::~wxGenericColourDialog() wxGenericColourDialog::~wxGenericColourDialog()
@@ -139,7 +136,7 @@ wxGenericColourDialog::~wxGenericColourDialog()
void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{ {
EndModal(wxID_CANCEL); EndModal(wxID_CANCEL);
} }
bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data) bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
@@ -162,7 +159,7 @@ bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
int wxGenericColourDialog::ShowModal() int wxGenericColourDialog::ShowModal()
{ {
return wxDialog::ShowModal(); return wxDialog::ShowModal();
} }
@@ -222,36 +219,36 @@ void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
void wxGenericColourDialog::CalculateMeasurements() void wxGenericColourDialog::CalculateMeasurements()
{ {
smallRectangleSize.x = 18; smallRectangleSize.x = 18;
smallRectangleSize.y = 14; smallRectangleSize.y = 14;
customRectangleSize.x = 40; customRectangleSize.x = 40;
customRectangleSize.y = 40; customRectangleSize.y = 40;
gridSpacing = 6; gridSpacing = 6;
sectionSpacing = 15; sectionSpacing = 15;
standardColoursRect.x = 10; standardColoursRect.x = 10;
#ifdef __WXPM__ #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 #else
standardColoursRect.y = 15; standardColoursRect.y = 15;
#endif #endif
standardColoursRect.width = (8*smallRectangleSize.x) + (7*gridSpacing); standardColoursRect.width = (8*smallRectangleSize.x) + (7*gridSpacing);
standardColoursRect.height = (6*smallRectangleSize.y) + (5*gridSpacing); standardColoursRect.height = (6*smallRectangleSize.y) + (5*gridSpacing);
customColoursRect.x = standardColoursRect.x; customColoursRect.x = standardColoursRect.x;
customColoursRect.y = standardColoursRect.y + standardColoursRect.height + 20; customColoursRect.y = standardColoursRect.y + standardColoursRect.height + 20;
customColoursRect.width = (8*smallRectangleSize.x) + (7*gridSpacing); customColoursRect.width = (8*smallRectangleSize.x) + (7*gridSpacing);
customColoursRect.height = (2*smallRectangleSize.y) + (1*gridSpacing); customColoursRect.height = (2*smallRectangleSize.y) + (1*gridSpacing);
singleCustomColourRect.x = customColoursRect.width + customColoursRect.x + sectionSpacing; singleCustomColourRect.x = customColoursRect.width + customColoursRect.x + sectionSpacing;
singleCustomColourRect.y = 80; singleCustomColourRect.y = 80;
singleCustomColourRect.width = customRectangleSize.x; singleCustomColourRect.width = customRectangleSize.x;
singleCustomColourRect.height = customRectangleSize.y; singleCustomColourRect.height = customRectangleSize.y;
okButtonX = 10; okButtonX = 10;
customButtonX = singleCustomColourRect.x ; customButtonX = singleCustomColourRect.x ;
buttonY = customColoursRect.y + customColoursRect.height + 10; buttonY = customColoursRect.y + customColoursRect.height + 10;
} }
void wxGenericColourDialog::CreateWidgets() void wxGenericColourDialog::CreateWidgets()
@@ -367,24 +364,24 @@ void wxGenericColourDialog::InitializeColours(void)
void wxGenericColourDialog::PaintBasicColours(wxDC& dc) void wxGenericColourDialog::PaintBasicColours(wxDC& dc)
{ {
int i; int i;
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
{
int j;
for (j = 0; j < 8; j++)
{ {
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 x = (j*(smallRectangleSize.x+gridSpacing) + standardColoursRect.x);
int y = (i*(smallRectangleSize.y+gridSpacing) + standardColoursRect.y); int y = (i*(smallRectangleSize.y+gridSpacing) + standardColoursRect.y);
dc.SetPen(*wxBLACK_PEN); dc.SetPen(*wxBLACK_PEN);
wxBrush brush(standardColours[ptr], wxSOLID); wxBrush brush(standardColours[ptr], wxSOLID);
dc.SetBrush(brush); 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::PaintCustomColours(wxDC& dc)
@@ -458,16 +455,16 @@ void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw)
void wxGenericColourDialog::PaintCustomColour(wxDC& dc) void wxGenericColourDialog::PaintCustomColour(wxDC& dc)
{ {
dc.SetPen(*wxBLACK_PEN); dc.SetPen(*wxBLACK_PEN);
wxBrush *brush = new wxBrush(colourData.m_dataColour, wxSOLID); wxBrush *brush = new wxBrush(colourData.m_dataColour, wxSOLID);
dc.SetBrush(*brush); dc.SetBrush(*brush);
dc.DrawRectangle( singleCustomColourRect.x, singleCustomColourRect.y, dc.DrawRectangle( singleCustomColourRect.x, singleCustomColourRect.y,
customRectangleSize.x, customRectangleSize.y); customRectangleSize.x, customRectangleSize.y);
dc.SetBrush(wxNullBrush); dc.SetBrush(wxNullBrush);
delete brush; delete brush;
} }
void wxGenericColourDialog::OnBasicColourClick(int which) void wxGenericColourDialog::OnBasicColourClick(int which)

3
src/msw/slider95.cpp
View File

@@ -27,11 +27,12 @@
#if wxUSE_SLIDER #if wxUSE_SLIDER
#include "wx/slider.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/brush.h" #include "wx/brush.h"
#endif #endif
#include "wx/slider.h"
#include "wx/msw/subwin.h" #include "wx/msw/subwin.h"
// include <commctrl.h> "properly" // include <commctrl.h> "properly"

2
src/palmos/control.cpp
View File

@@ -37,11 +37,11 @@
#include "wx/button.h" #include "wx/button.h"
#include "wx/checkbox.h" #include "wx/checkbox.h"
#include "wx/radiobut.h" #include "wx/radiobut.h"
#include "wx/slider.h"
#endif #endif
#include "wx/toplevel.h" #include "wx/toplevel.h"
#include "wx/tglbtn.h" #include "wx/tglbtn.h"
#include "wx/slider.h"
#include <Control.h> #include <Control.h>
#include <Form.h> #include <Form.h>

7
src/palmos/slider.cpp
View File

@@ -18,10 +18,11 @@
#if wxUSE_SLIDER #if wxUSE_SLIDER
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/brush.h"
#include "wx/slider.h" #include "wx/slider.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/brush.h"
#endif #endif
#include "wx/toplevel.h" #include "wx/toplevel.h"

2
src/palmos/toplevel.cpp
View File

@@ -36,6 +36,7 @@
#include "wx/button.h" #include "wx/button.h"
#include "wx/checkbox.h" #include "wx/checkbox.h"
#include "wx/radiobut.h" #include "wx/radiobut.h"
#include "wx/slider.h"
#endif //WX_PRECOMP #endif //WX_PRECOMP
#include "wx/module.h" #include "wx/module.h"
@@ -43,7 +44,6 @@
// controls for sending select event // controls for sending select event
#include "wx/tglbtn.h" #include "wx/tglbtn.h"
#include "wx/slider.h"
#include "wx/datectrl.h" #include "wx/datectrl.h"
#include <Window.h> #include <Window.h>

8
src/univ/slider.cpp
View File

@@ -48,13 +48,13 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#ifndef WX_PRECOMP #if wxUSE_SLIDER
#include "wx/dc.h"
#endif
#include "wx/slider.h" #include "wx/slider.h"
#if wxUSE_SLIDER #ifndef WX_PRECOMP
#include "wx/dc.h"
#endif
#include "wx/univ/renderer.h" #include "wx/univ/renderer.h"
#include "wx/univ/inphand.h" #include "wx/univ/inphand.h"

9
src/xrc/xh_slidr.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: xh_slidr.cpp // Name: src/xrc/xh_slidr.cpp
// Purpose: XRC resource for wxSlider // Purpose: XRC resource for wxSlider
// Author: Bob Mitchell // Author: Bob Mitchell
// Created: 2000/03/21 // Created: 2000/03/21
@@ -18,12 +18,15 @@
#if wxUSE_XRC && wxUSE_SLIDER #if wxUSE_XRC && wxUSE_SLIDER
#include "wx/xrc/xh_slidr.h" #include "wx/xrc/xh_slidr.h"
#include "wx/slider.h"
#ifndef WX_PRECOMP
#include "wx/slider.h"
#endif
IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler) IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler)
wxSliderXmlHandler::wxSliderXmlHandler() wxSliderXmlHandler::wxSliderXmlHandler()
: wxXmlResourceHandler() :wxXmlResourceHandler()
{ {
XRC_ADD_STYLE(wxSL_HORIZONTAL); XRC_ADD_STYLE(wxSL_HORIZONTAL);
XRC_ADD_STYLE(wxSL_VERTICAL); XRC_ADD_STYLE(wxSL_VERTICAL);