From f4da9a943131e6654f05dbf0761e52593d30e5b5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 6 Jun 2006 16:28:58 +0000 Subject: [PATCH] Include wx/slider.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/slider.mm | 10 ++-- src/generic/colrdlgg.cpp | 113 +++++++++++++++++++-------------------- src/msw/slider95.cpp | 3 +- src/palmos/control.cpp | 2 +- src/palmos/slider.cpp | 7 +-- src/palmos/toplevel.cpp | 2 +- src/univ/slider.cpp | 8 +-- src/xrc/xh_slidr.cpp | 9 ++-- 8 files changed, 79 insertions(+), 75 deletions(-) diff --git a/src/cocoa/slider.mm b/src/cocoa/slider.mm index 2183b7b5cc..9e3e790f42 100644 --- a/src/cocoa/slider.mm +++ b/src/cocoa/slider.mm @@ -1,26 +1,28 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/slider.mm +// Name: src/cocoa/slider.mm // Purpose: wxSlider // Author: David Elliott // Modified by: // Created: 2003/06/19 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + #if wxUSE_SLIDER +#include "wx/slider.h" + #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/slider.h" #endif //WX_PRECOMP #import IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) -BEGIN_EVENT_TABLE(wxSlider, wxSliderBase) + BEGIN_EVENT_TABLE(wxSlider, wxSliderBase) END_EVENT_TABLE() // WX_IMPLEMENT_COCOA_OWNER(wxSlider,NSSlider,NSControl,NSView) diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index a868d28d58..17250ef7ad 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: @@ -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); - - 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() @@ -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) diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp index 2a9a690577..480e82b600 100644 --- a/src/msw/slider95.cpp +++ b/src/msw/slider95.cpp @@ -27,11 +27,12 @@ #if wxUSE_SLIDER +#include "wx/slider.h" + #ifndef WX_PRECOMP #include "wx/brush.h" #endif -#include "wx/slider.h" #include "wx/msw/subwin.h" // include "properly" diff --git a/src/palmos/control.cpp b/src/palmos/control.cpp index bf5e892cd4..78f94c3182 100644 --- a/src/palmos/control.cpp +++ b/src/palmos/control.cpp @@ -37,11 +37,11 @@ #include "wx/button.h" #include "wx/checkbox.h" #include "wx/radiobut.h" + #include "wx/slider.h" #endif #include "wx/toplevel.h" #include "wx/tglbtn.h" -#include "wx/slider.h" #include #include diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp index be30bb7a7c..7598d4f846 100644 --- a/src/palmos/slider.cpp +++ b/src/palmos/slider.cpp @@ -18,10 +18,11 @@ #if wxUSE_SLIDER -#ifndef WX_PRECOMP -#include "wx/utils.h" -#include "wx/brush.h" #include "wx/slider.h" + +#ifndef WX_PRECOMP + #include "wx/utils.h" + #include "wx/brush.h" #endif #include "wx/toplevel.h" diff --git a/src/palmos/toplevel.cpp b/src/palmos/toplevel.cpp index 50cff4a252..cc98629ee9 100644 --- a/src/palmos/toplevel.cpp +++ b/src/palmos/toplevel.cpp @@ -36,6 +36,7 @@ #include "wx/button.h" #include "wx/checkbox.h" #include "wx/radiobut.h" + #include "wx/slider.h" #endif //WX_PRECOMP #include "wx/module.h" @@ -43,7 +44,6 @@ // controls for sending select event #include "wx/tglbtn.h" -#include "wx/slider.h" #include "wx/datectrl.h" #include diff --git a/src/univ/slider.cpp b/src/univ/slider.cpp index e554c51ae2..25d5e99541 100644 --- a/src/univ/slider.cpp +++ b/src/univ/slider.cpp @@ -48,13 +48,13 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP - #include "wx/dc.h" -#endif +#if wxUSE_SLIDER #include "wx/slider.h" -#if wxUSE_SLIDER +#ifndef WX_PRECOMP + #include "wx/dc.h" +#endif #include "wx/univ/renderer.h" #include "wx/univ/inphand.h" diff --git a/src/xrc/xh_slidr.cpp b/src/xrc/xh_slidr.cpp index 3aa21bd9f2..c34926df31 100644 --- a/src/xrc/xh_slidr.cpp +++ b/src/xrc/xh_slidr.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: xh_slidr.cpp +// Name: src/xrc/xh_slidr.cpp // Purpose: XRC resource for wxSlider // Author: Bob Mitchell // Created: 2000/03/21 @@ -18,12 +18,15 @@ #if wxUSE_XRC && wxUSE_SLIDER #include "wx/xrc/xh_slidr.h" -#include "wx/slider.h" + +#ifndef WX_PRECOMP + #include "wx/slider.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxSliderXmlHandler, wxXmlResourceHandler) wxSliderXmlHandler::wxSliderXmlHandler() -: wxXmlResourceHandler() + :wxXmlResourceHandler() { XRC_ADD_STYLE(wxSL_HORIZONTAL); XRC_ADD_STYLE(wxSL_VERTICAL); -- 2.47.2