X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cd34332fc40b7f43507ec3c724a3abb64d42ff7c..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/generic/colrdlgg.h diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h index 2b9e0dc4e1..0d59436e90 100644 --- a/include/wx/generic/colrdlgg.h +++ b/include/wx/generic/colrdlgg.h @@ -1,120 +1,119 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colrdlgg.h +// Name: wx/generic/colrdlgg.h // Purpose: wxGenericColourDialog // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __COLORDLGH_G__ #define __COLORDLGH_G__ -#ifdef __GNUG__ -#pragma interface "colrdlgg.h" -#endif - -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/gdicmn.h" #include "wx/dialog.h" #include "wx/cmndata.h" #define wxID_ADD_CUSTOM 3000 -#define wxID_RED_SLIDER 3001 -#define wxID_GREEN_SLIDER 3002 -#define wxID_BLUE_SLIDER 3003 -class WXDLLEXPORT wxSlider; -class WXDLLEXPORT wxGenericColourDialog: public wxDialog +#if wxUSE_SLIDER + + #define wxID_RED_SLIDER 3001 + #define wxID_GREEN_SLIDER 3002 + #define wxID_BLUE_SLIDER 3003 + + class WXDLLIMPEXP_FWD_CORE wxSlider; + +#endif // wxUSE_SLIDER + +class WXDLLEXPORT wxGenericColourDialog : public wxDialog { - DECLARE_DYNAMIC_CLASS(wxGenericColourDialog) - protected: - wxColourData colourData; - wxWindow *dialogParent; +public: + wxGenericColourDialog(); + wxGenericColourDialog(wxWindow *parent, + wxColourData *data = (wxColourData *) NULL); + virtual ~wxGenericColourDialog(); - // Area reserved for grids of colours - wxRect standardColoursRect; - wxRect customColoursRect; - wxRect singleCustomColourRect; + bool Create(wxWindow *parent, wxColourData *data = (wxColourData *) NULL); - // Size of each colour rectangle - wxPoint smallRectangleSize; + wxColourData &GetColourData() { return m_colourData; } - // For single customizable colour - wxPoint customRectangleSize; + virtual int ShowModal(); - // Grid spacing (between rectangles) - int gridSpacing; + // Internal functions + void OnMouseEvent(wxMouseEvent& event); + void OnPaint(wxPaintEvent& event); - // Section spacing (between left and right halves of dialog box) - int sectionSpacing; + virtual void CalculateMeasurements(); + virtual void CreateWidgets(); + virtual void InitializeColours(); - // 48 'standard' colours - wxColour standardColours[48]; + virtual void PaintBasicColours(wxDC& dc); + virtual void PaintCustomColours(wxDC& dc); + virtual void PaintCustomColour(wxDC& dc); + virtual void PaintHighlight(wxDC& dc, bool draw); - // 16 'custom' colours - wxColour customColours[16]; + virtual void OnBasicColourClick(int which); + virtual void OnCustomColourClick(int which); - // One single custom colour (use sliders) - wxColour singleCustomColour; + void OnAddCustom(wxCommandEvent& event); - // Which colour is selected? An index into one of the two areas. - int colourSelection; - int whichKind; // 1 for standard colours, 2 for custom colours, +#if wxUSE_SLIDER + void OnRedSlider(wxCommandEvent& event); + void OnGreenSlider(wxCommandEvent& event); + void OnBlueSlider(wxCommandEvent& event); +#endif // wxUSE_SLIDER - wxSlider *redSlider; - wxSlider *greenSlider; - wxSlider *blueSlider; + void OnCloseWindow(wxCloseEvent& event); - int buttonY; +protected: + wxColourData m_colourData; - int okButtonX; - int customButtonX; + // Area reserved for grids of colours + wxRect m_standardColoursRect; + wxRect m_customColoursRect; + wxRect m_singleCustomColourRect; -// static bool colourDialogCancelled; - public: - wxGenericColourDialog(void); - wxGenericColourDialog(wxWindow *parent, wxColourData *data = (wxColourData *) NULL); - ~wxGenericColourDialog(void); + // Size of each colour rectangle + wxPoint m_smallRectangleSize; - bool Create(wxWindow *parent, wxColourData *data = (wxColourData *) NULL); + // For single customizable colour + wxPoint m_customRectangleSize; - int ShowModal(void); - wxColourData &GetColourData(void) { return colourData; } + // Grid spacing (between rectangles) + int m_gridSpacing; - // Internal functions - void OnMouseEvent(wxMouseEvent& event); - void OnPaint(wxPaintEvent& event); + // Section spacing (between left and right halves of dialog box) + int m_sectionSpacing; - virtual void CalculateMeasurements(void); - virtual void CreateWidgets(void); - virtual void InitializeColours(void); - - virtual void PaintBasicColours(wxDC& dc); - virtual void PaintCustomColours(wxDC& dc); - virtual void PaintCustomColour(wxDC& dc); - virtual void PaintHighlight(wxDC& dc, bool draw); + // 48 'standard' colours + wxColour m_standardColours[48]; - virtual void OnBasicColourClick(int which); - virtual void OnCustomColourClick(int which); + // 16 'custom' colours + wxColour m_customColours[16]; - void OnAddCustom(wxCommandEvent& event); + // Which colour is selected? An index into one of the two areas. + int m_colourSelection; + int m_whichKind; // 1 for standard colours, 2 for custom colours, - void OnRedSlider(wxCommandEvent& event); - void OnGreenSlider(wxCommandEvent& event); - void OnBlueSlider(wxCommandEvent& event); +#if wxUSE_SLIDER + wxSlider *m_redSlider; + wxSlider *m_greenSlider; + wxSlider *m_blueSlider; +#endif // wxUSE_SLIDER - void OnCloseWindow(wxCloseEvent& event); + int m_buttonY; -DECLARE_EVENT_TABLE() -}; + int m_okButtonX; + int m_customButtonX; -/* This shouldn't be necessary, we have a #define in wx/colordlg.h. -#ifdef __WXGTK__ -typedef wxGenericColourDialog wxColourDialog; -#endif -*/ + // static bool colourDialogCancelled; + + DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxGenericColourDialog) +}; #endif