Updated ten thousand macros for new event type code.

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

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index e3b0a04c79f627716cf07aa633f9e7fa94d57170..984ce43dc84f43764a4f7b2b8db647b7f84b28f6 100644 (file)
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -1,5 +1,5 @@
-#ifndef __COLORDLGH_BASE__
-#define __COLORDLGH_BASE__
+#ifndef _WX_COLORDLG_H_BASE_
+#define _WX_COLORDLG_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/colordlg.h"
@@ -7,7 +7,24 @@
 #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
 
+#if !defined(__WXMSW__)
+#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
-    // __COLORDLGH_BASE__
+    // _WX_COLORDLG_H_BASE_