X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/470d7e4f3eb53880c30ca809e0fd9757948ac4f2..5acb9127c51a79e792f6faeea6c70f32e622ee17:/include/wx/colordlg.h?ds=sidebyside

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 8b8ce1d292..7c36c2b1a7 100644
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -5,30 +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__)
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/colordlg.h"
-#elif defined(__WXMAC__)
-    #include "wx/mac/colordlg.h"
+#elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
+    #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
-    #define sm_classwxColourDialog sm_classwxGenericColourDialog
 #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 = (wxWindow *)NULL,
+                                              const wxColour& colInit = wxNullColour,
+                                              const wxString& caption = wxEmptyString,
+                                              wxColourData *data = NULL);
 
 #endif // wxUSE_COLOURDLG