X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b4e76e0d7e4c1be878e125df31dc9370bb0fa99e..6cedba093a6d87371ca67534b1b9165fe3d45fbc:/include/wx/colordlg.h?ds=sidebyside

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index d2453d9a0e..984ce43dc8 100644
--- 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"
@@ -9,7 +9,22 @@
 #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_