X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..695237bccd652c60deba347117ba5ab32067880c:/include/wx/generic/colrdlgg.h diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h index c0629c183e..2b9e0dc4e1 100644 --- a/include/wx/generic/colrdlgg.h +++ b/include/wx/generic/colrdlgg.h @@ -35,15 +35,15 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog 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; @@ -76,20 +76,18 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog // 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); @@ -102,20 +100,21 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog 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