X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/274ad000d2eec40f0af7d2c40940aeece00765d3..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/colordlg.h diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index e953735ab7..2f9df47192 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/colrdlgg.h +// Name: wx/colordlg.h // Purpose: wxColourDialog // Author: Vadim Zeitiln // Modified by: @@ -16,10 +16,12 @@ #if wxUSE_COLOURDLG +#include "wx/colourdata.h" + #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) #include "wx/msw/colordlg.h" #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__) - #include "wx/mac/colordlg.h" + #include "wx/osx/colordlg.h" #elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) #include "wx/gtk/colordlg.h" #else @@ -29,9 +31,10 @@ #endif // get the colour from user and return it -wxColour WXDLLEXPORT -wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL, - const wxColour& colInit = wxNullColour); +WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = NULL, + const wxColour& colInit = wxNullColour, + const wxString& caption = wxEmptyString, + wxColourData *data = NULL); #endif // wxUSE_COLOURDLG