preserve custom colours between calls to wxGetColourFromUser(), also allow passing a custom wxColourData to it (modified patch 1832582)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/colordlg.h

@@ -30,10 +30,14 @@
     #define wxColourDialog wxGenericColourDialog
 #endif
 
+class WXDLLIMPEXP_FWD_CORE wxColourData;
+
 // get the colour from user and return it
 wxColour WXDLLEXPORT
 wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
-                    const wxColour& colInit = wxNullColour, const wxString& caption = wxEmptyString);
+                    const wxColour& colInit = wxNullColour,
+                    const wxString& caption = wxEmptyString,
+                    wxColourData *data = NULL);
 
 #endif // wxUSE_COLOURDLG