wxWindow *dialogParent;
// Area reserved for grids of colours
- wxRectangle standardColoursRect;
- wxRectangle customColoursRect;
- wxRectangle singleCustomColourRect;
+ wxRect standardColoursRect;
+ wxRect customColoursRect;
+ wxRect singleCustomColourRect;
// Size of each colour rectangle
- wxIntPoint smallRectangleSize;
+ wxPoint smallRectangleSize;
// For single customizable colour
- wxIntPoint customRectangleSize;
+ wxPoint customRectangleSize;
// Grid spacing (between rectangles)
int gridSpacing;
// static bool colourDialogCancelled;
public:
wxGenericColourDialog(void);
- wxGenericColourDialog(wxWindow *parent, wxColourData *data = NULL);
+ wxGenericColourDialog(wxWindow *parent, wxColourData *data = (wxColourData *) NULL);
~wxGenericColourDialog(void);
- bool Create(wxWindow *parent, wxColourData *data = NULL);
+ bool Create(wxWindow *parent, wxColourData *data = (wxColourData *) NULL);
int ShowModal(void);
- wxColourData GetColourData(void) { return colourData; }
+ wxColourData &GetColourData(void) { return colourData; }
// Internal functions
void OnMouseEvent(wxMouseEvent& event);
void OnPaint(wxPaintEvent& event);
- bool OnClose(void);
-
virtual void CalculateMeasurements(void);
virtual void CreateWidgets(void);
virtual void InitializeColours(void);
virtual void OnBasicColourClick(int which);
virtual void OnCustomColourClick(int which);
-/*
- virtual void OnOk(void);
- virtual void OnCancel(void);
- virtual void OnAddCustom(void);
-*/
void OnAddCustom(wxCommandEvent& event);
void OnRedSlider(wxCommandEvent& event);
void OnGreenSlider(wxCommandEvent& event);
void OnBlueSlider(wxCommandEvent& event);
+ void OnCloseWindow(wxCloseEvent& event);
+
DECLARE_EVENT_TABLE()
};
+/* This shouldn't be necessary, we have a #define in wx/colordlg.h.
+#ifdef __WXGTK__
typedef wxGenericColourDialog wxColourDialog;
+#endif
+*/
#endif