X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5d9cc735c3222fcbea9cb5a55a3de61fa12e146..cbeda384e51acb82e13994cb67ac1714669cae10:/include/wx/colordlg.h?ds=inline diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index 6992910c67..2015970c47 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -19,7 +19,7 @@ #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" #elif defined(__WXPALMOS__) @@ -30,10 +30,13 @@ #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); +WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = NULL, + const wxColour& colInit = wxNullColour, + const wxString& caption = wxEmptyString, + wxColourData *data = NULL); #endif // wxUSE_COLOURDLG