X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..43c42c18d36c703a88b1b7b697bac27fe5608eca:/include/wx/colordlg.h?ds=sidebyside diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index 3c5cef8a6a..2f9df47192 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -1,23 +1,29 @@ ///////////////////////////////////////////////////////////////////////////// -// 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: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_COLORDLG_H_BASE_ #define _WX_COLORDLG_H_BASE_ +#include "wx/defs.h" + #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" #else #include "wx/generic/colrdlgg.h" @@ -25,9 +31,10 @@ #endif // 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 = NULL, + const wxColour& colInit = wxNullColour, + const wxString& caption = wxEmptyString, + wxColourData *data = NULL); #endif // wxUSE_COLOURDLG