typos due to much cut-and-paste: colour -> font in the docs and comment

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index 7ff85d8c5145fc5d8ec0cc5eeaf64e28dd3ecf0b..337fd06c4dadb2a11273b9928dd11c328defac63 100644 (file)
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -1359,7 +1359,7 @@ is valid) if the dialog was cancelled.
 
 \wxheading{Parameters}
 
-\docparam{parent}{The parent window for the colour selection dialog}
+\docparam{parent}{The parent window for the font selection dialog}
 
 \docparam{fontInit}{If given, this will be the font initially selected in the dialog.}
 

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 681c6ab5c12e2ef71bcd652012280a1e6802c08b..1396becad1c058a0102b8f978d05fdde8fa51a82 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -15,7 +15,8 @@
 #   include "wx/os2/fontdlg.h"
 #endif
 
-// get the colour from user and return it
+// get the font from user and return it, returns wxNullFont if the dialog was
+// cancelled
 wxFont WXDLLEXPORT
 wxGetFontFromUser(wxWindow *parent = (wxWindow *)NULL,
                   const wxFont& fontInit = wxNullFont);