wxTimer::Start() now calls Stop()

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

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 75e6b83f7d853b260de8f918209ff5e26307f2ac..984ce43dc84f43764a4f7b2b8db647b7f84b28f6 100644 (file)
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -12,7 +12,7 @@
 #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
@@ -22,5 +22,9 @@
 #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_