X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..19b409860202ab9bdc27dab3d17f388c1a1d9717:/include/wx/colordlg.h diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h index d0aac1af88..2015970c47 100644 --- a/include/wx/colordlg.h +++ b/include/wx/colordlg.h @@ -19,7 +19,7 @@ #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) #include "wx/msw/colordlg.h" #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__) - #include "wx/mac/colordlg.h" + #include "wx/osx/colordlg.h" #elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) #include "wx/gtk/colordlg.h" #elif defined(__WXPALMOS__) @@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxColourData; // get the colour from user and return it -WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL, +WXDLLIMPEXP_CORE wxColour wxGetColourFromUser(wxWindow *parent = NULL, const wxColour& colInit = wxNullColour, const wxString& caption = wxEmptyString, wxColourData *data = NULL);