use generic timer in wxMGL and wxX11

[wxWidgets.git] / include / wx / colordlg.h

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 75e6b83f7d853b260de8f918209ff5e26307f2ac..54a8fdc5153039a8c313506e030caa85085cd871 100644 (file)
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -1,26 +1,34 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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"
-#elif defined(__WXMAC__)
-#include "wx/generic/colrdlgg.h"
-#elif defined(__WXPM__)
-#include "wx/os2/colordlg.h"
-#elif defined(__WXSTUBS__)
-#include "wx/generic/colrdlgg.h"
-#endif
+    #include "wx/msw/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_