X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f14d6dd133f96d7110b9ff635e977349b1806238..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/colordlg.h?ds=sidebyside diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index 8fb0ff6af2..b4156d1460 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/colrdlgg.h +// Name: wx/colordlg.h // Purpose: wxColourDialog // Author: Vadim Zeitiln // Modified by: // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -16,14 +15,14 @@ #if wxUSE_COLOURDLG +#include "wx/colourdata.h" + #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" @@ -31,9 +30,10 @@ #endif // get the colour from user and return it -wxColour WXDLLEXPORT -wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL, - const wxColour& colInit = wxNullColour, const wxString& caption = wxEmptyString); +WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = NULL, + const wxColour& colInit = wxNullColour, + const wxString& caption = wxEmptyString, + wxColourData *data = NULL); #endif // wxUSE_COLOURDLG