Added caption parameter to wxGetFontFromUser and wxGetColourFromUser.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 14:26:36 +00:00
parent 99c613c5c4
commit f14d6dd133
5 changed files with 50 additions and 6 deletions
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -33,7 +33,7 @@
 // get the colour from user and return it
 wxColour WXDLLEXPORT
 wxGetColourFromUser(wxWindow *parent = (wxWindow *)NULL,
-                    const wxColour& colInit = wxNullColour);
+                    const wxColour& colInit = wxNullColour, const wxString& caption = wxEmptyString);

 #endif // wxUSE_COLOURDLG

--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -102,7 +102,7 @@ protected:
 // cancelled
 wxFont WXDLLEXPORT
 wxGetFontFromUser(wxWindow *parent = (wxWindow *)NULL,
-                  const wxFont& fontInit = wxNullFont);
+                  const wxFont& fontInit = wxNullFont, const wxString& caption = wxEmptyString);

 #endif // wxUSE_FONTDLG