added wxGetMultiChoice() (which refuses to work for some reason - will fix

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

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 0e3c7cfaf4adabc44b60c18022ea7b9a8b5d106c..984ce43dc84f43764a4f7b2b8db647b7f84b28f6 100644 (file)
--- 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__)
 #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
 
 #elif defined(__WXSTUBS__)
 #include "wx/generic/colrdlgg.h"
 #endif
 

-#if defined(__WXMSW__)
+#if !defined(__WXMSW__)

 #define wxColourDialog wxGenericColourDialog
 #define wxColourDialog wxGenericColourDialog

-#define sm_classwxColourDialog sm_classwxColourDialog
+#define sm_classwxColourDialog sm_classwxGenericColourDialog

 #endif
 
 #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_
 #endif
     // _WX_COLORDLG_H_BASE_