X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..a0b575116060526bf26554a2fe5d29ec2c0bc693:/include/wx/colordlg.h diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index 06323076cd..6bff18a13b 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -12,22 +12,32 @@ #ifndef _WX_COLORDLG_H_BASE_ #define _WX_COLORDLG_H_BASE_ +#include "wx/defs.h" + #if wxUSE_COLOURDLG #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) #include "wx/msw/colordlg.h" #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__) #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); + const wxColour& colInit = wxNullColour, + const wxString& caption = wxEmptyString, + wxColourData *data = NULL); #endif // wxUSE_COLOURDLG