X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cdb542c4df079e47b2bc4859c822ea61066b016..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/colordlg.h?ds=sidebyside diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index 54a8fdc515..8fb0ff6af2 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -5,28 +5,35 @@ // 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__) +#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 - #define sm_classwxColourDialog sm_classwxGenericColourDialog #endif // 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); #endif // wxUSE_COLOURDLG