X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3dd4e4e05cc46ffc653730715e527af7b18b9caf..4797b0145c81236c08cdee4f05e616ef17924a50:/include/wx/colordlg.h?ds=sidebyside

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index a8ca97c25b..7c36c2b1a7 100644
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -1,24 +1,44 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/colrdlgg.h
+// Purpose:     wxColourDialog
+// Author:      Vadim Zeitiln
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id$
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_COLORDLG_H_BASE_
 #define _WX_COLORDLG_H_BASE_
 
-#if defined(__WXMSW__)
-#include "wx/msw/colordlg.h"
-#elif defined(__WXMOTIF__)
-#include "wx/generic/colrdlgg.h"
-#elif defined(__WXGTK__)
-#include "wx/generic/colrdlgg.h"
-#elif defined(__WXQT__)
-#include "wx/generic/colrdlgg.h"
-#elif defined(__WXMAC__)
-#include "wx/generic/colrdlgg.h"
-#elif defined(__WXSTUBS__)
-#include "wx/generic/colrdlgg.h"
-#endif
+#include "wx/defs.h"
+
+#if wxUSE_COLOURDLG
+
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    #include "wx/msw/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"
 
-#ifndef __WXMSW__
-#define wxColourDialog wxGenericColourDialog
-#define sm_classwxColourDialog sm_classwxColourDialog
+    #define wxColourDialog wxGenericColourDialog
 #endif
 
+class WXDLLIMPEXP_FWD_CORE wxColourData;
+
+// get the colour from user and return it
+WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
+                                              const wxColour& colInit = wxNullColour,
+                                              const wxString& caption = wxEmptyString,
+                                              wxColourData *data = NULL);
+
+#endif // wxUSE_COLOURDLG
+
 #endif
     // _WX_COLORDLG_H_BASE_