X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2049ba38adafa0ec146880de29f26e32dd69a125..2d120f8391920145647ec10e84629bc21fa9f1bb:/include/wx/generic/colrdlgg.h diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h index 6229f6d144..942d2ed8ee 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,13 +76,13 @@ 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);