X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3dd4e4e05cc46ffc653730715e527af7b18b9caf..1a0d517ea4dbcef61ba9b0868318f686e97618bb:/include/wx/colordlg.h diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index a8ca97c25b..984ce43dc8 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -11,14 +11,20 @@ #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 -#ifndef __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_