X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/274ad000d2eec40f0af7d2c40940aeece00765d3..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/colordlg.h?ds=sidebyside diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index e953735ab7..d0aac1af88 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -22,16 +22,21 @@ #include "wx/mac/colordlg.h" #elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) #include "wx/gtk/colordlg.h" +#elif defined(__WXPALMOS__) + #include "wx/palmos/colordlg.h" #else #include "wx/generic/colrdlgg.h" #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 = (wxWindow *)NULL, + const wxColour& colInit = wxNullColour, + const wxString& caption = wxEmptyString, + wxColourData *data = NULL); #endif // wxUSE_COLOURDLG