// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c)
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __COLORDLGH_G__
#define __COLORDLGH_G__
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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;
+#if wxUSE_SLIDER
+
+ #define wxID_RED_SLIDER 3001
+ #define wxID_GREEN_SLIDER 3002
+ #define wxID_BLUE_SLIDER 3003
+
+ class WXDLLEXPORT wxSlider;
+
+#endif // wxUSE_SLIDER
+
class WXDLLEXPORT wxGenericColourDialog : public wxDialog
{
public:
bool Create(wxWindow *parent, wxColourData *data = (wxColourData *) NULL);
- wxColourData &GetColourData() { return colourData; }
+ wxColourData &GetColourData() { return m_colourData; }
virtual int ShowModal();
void OnAddCustom(wxCommandEvent& event);
+#if wxUSE_SLIDER
void OnRedSlider(wxCommandEvent& event);
void OnGreenSlider(wxCommandEvent& event);
void OnBlueSlider(wxCommandEvent& event);
+#endif // wxUSE_SLIDER
void OnCloseWindow(wxCloseEvent& event);
protected:
- wxColourData colourData;
- wxWindow *dialogParent;
+ wxColourData m_colourData;
// Area reserved for grids of colours
- wxRect standardColoursRect;
- wxRect customColoursRect;
- wxRect singleCustomColourRect;
+ wxRect m_standardColoursRect;
+ wxRect m_customColoursRect;
+ wxRect m_singleCustomColourRect;
// Size of each colour rectangle
- wxPoint smallRectangleSize;
+ wxPoint m_smallRectangleSize;
// For single customizable colour
- wxPoint customRectangleSize;
+ wxPoint m_customRectangleSize;
// Grid spacing (between rectangles)
- int gridSpacing;
+ int m_gridSpacing;
// Section spacing (between left and right halves of dialog box)
- int sectionSpacing;
+ int m_sectionSpacing;
// 48 'standard' colours
- wxColour standardColours[48];
+ wxColour m_standardColours[48];
// 16 'custom' colours
- wxColour customColours[16];
+ wxColour m_customColours[16];
// Which colour is selected? An index into one of the two areas.
- int colourSelection;
- int whichKind; // 1 for standard colours, 2 for custom colours,
+ int m_colourSelection;
+ int m_whichKind; // 1 for standard colours, 2 for custom colours,
- wxSlider *redSlider;
- wxSlider *greenSlider;
- wxSlider *blueSlider;
+#if wxUSE_SLIDER
+ wxSlider *m_redSlider;
+ wxSlider *m_greenSlider;
+ wxSlider *m_blueSlider;
+#endif // wxUSE_SLIDER
- int buttonY;
+ int m_buttonY;
- int okButtonX;
- int customButtonX;
+ int m_okButtonX;
+ int m_customButtonX;
// static bool colourDialogCancelled;