X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/91b4c08d6f5ceb50e1fab3d9b6477dd8c0d54a20..53a3a6dc63c36641ad3104a080edaf7fdda512a7:/include/wx/colordlg.h

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 984ce43dc8..8fb0ff6af2 100644
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -1,30 +1,41 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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(__WXPM__)
-#include "wx/generic/colrdlgg.h"
-#elif defined(__WXSTUBS__)
-#include "wx/generic/colrdlgg.h"
-#endif
+#include "wx/defs.h"
+
+#if wxUSE_COLOURDLG
 
-#if !defined(__WXMSW__)
-#define wxColourDialog wxGenericColourDialog
-#define sm_classwxColourDialog sm_classwxGenericColourDialog
+#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
 #endif
 
 // get the colour from user and return it
-wxColour WXDLLEXPORT wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
-                                         const wxColour& colInit = wxNullColour);
+wxColour WXDLLEXPORT
+wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
+                    const wxColour& colInit = wxNullColour, const wxString& caption = wxEmptyString);
+
+#endif // wxUSE_COLOURDLG
 
 #endif
     // _WX_COLORDLG_H_BASE_