X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb46a9a6c6f291806a5fecbb848930c344e17e11..10769d8c47c21fe0ec5034726791a5ad4cf19475:/include/wx/colordlg.h?ds=sidebyside

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 4f32249140..8b8ce1d292 100644
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -1,26 +1,36 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/colrdlgg.h
+// Purpose:     wxColourDialog
+// Author:      Vadim Zeitiln
+// Modified by:
+// Created:     01/02/97
+// RCS-ID:      $Id$
+// Copyright:   (c) wxWindows team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_COLORDLG_H_BASE_
 #define _WX_COLORDLG_H_BASE_
 
+#if wxUSE_COLOURDLG
+
 #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"
+    #include "wx/msw/colordlg.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/mac/colordlg.h"
+#else
+    #include "wx/generic/colrdlgg.h"
 
-#if !defined(__WXMSW__)
-#define wxColourDialog wxGenericColourDialog
-#define sm_classwxColourDialog sm_classwxGenericColourDialog
+    #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);
+
+#endif // wxUSE_COLOURDLG
+
 #endif
     // _WX_COLORDLG_H_BASE_