X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9cacf3e495f3aacb919ee1046338a25982db86c..7e08bc5acd8ee4e2f0756f50bf98937a118f9951:/include/wx/colordlg.h?ds=inline diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index f08d224b5b..2015970c47 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -5,29 +5,38 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #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" + #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 = NULL, + const wxColour& colInit = wxNullColour, + const wxString& caption = wxEmptyString, + wxColourData *data = NULL); #endif // wxUSE_COLOURDLG