/////////////////////////////////////////////////////////////////////////////
-// 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
/////////////////////////////////////////////////////////////////////////////
#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"
#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