X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef0e92205a01c7d0ca6f381cc690cb5d4fa595c9..a703012aedeb8064c8294c6aeeea95e6950ad170:/include/wx/colordlg.h diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index 7c36c2b1a7..efd30ad4a7 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,6 +16,8 @@ #if wxUSE_COLOURDLG +#include "wx/colourdata.h" + #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) #include "wx/msw/colordlg.h" #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__) @@ -30,10 +32,8 @@ #define wxColourDialog wxGenericColourDialog #endif -class WXDLLIMPEXP_FWD_CORE wxColourData; - // get the colour from user and return it -WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL, +WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = NULL, const wxColour& colInit = wxNullColour, const wxString& caption = wxEmptyString, wxColourData *data = NULL);