X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37f214d588b02079a3ddf64c2e46585ca1657c1b..d6c9c1b71e069396bbe3850862de9aa10e6812e0:/include/wx/colordlg.h

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 0e3c7cfaf4..984ce43dc8 100644
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -12,15 +12,19 @@
 #elif defined(__WXMAC__)
 #include "wx/generic/colrdlgg.h"
 #elif defined(__WXPM__)
-#include "wx/os2/colordlg.h"
+#include "wx/generic/colrdlgg.h"
 #elif defined(__WXSTUBS__)
 #include "wx/generic/colrdlgg.h"
 #endif
 
-#if defined(__WXMSW__)
+#if !defined(__WXMSW__)
 #define wxColourDialog wxGenericColourDialog
-#define sm_classwxColourDialog sm_classwxColourDialog
+#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
     // _WX_COLORDLG_H_BASE_