X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/274ad000d2eec40f0af7d2c40940aeece00765d3..a7d403698f6750bbf8c161e88aee5ab8a6b0bcd4:/include/wx/colordlg.h diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index e953735ab7..7c36c2b1a7 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -19,19 +19,24 @@ #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__) + #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