Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

[wxWidgets.git] / src / common / fontdata.cpp

diff --git a/src/common/fontdata.cpp b/src/common/fontdata.cpp
index 05bd16f524fd4579e33462cf4b2a4792158abc6c..deef52ce2ac69bdbd7d85b1371ee0b607794a296 100644 (file)
--- a/src/common/fontdata.cpp
+++ b/src/common/fontdata.cpp
@@ -1,7 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/fontdata.cpp
 // Author:      Julian Smart
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -67,3 +66,29 @@ wxFontData& wxFontData::operator=(const wxFontData& data)
     return *this;
 }
 #endif // wxUSE_FONTDLG || wxUSE_FONTPICKERCTRL
+
+#if wxUSE_FONTDLG
+
+#include "wx/fontdlg.h"
+
+wxFont wxGetFontFromUser(wxWindow *parent, const wxFont& fontInit, const wxString& caption)
+{
+    wxFontData data;
+    if ( fontInit.IsOk() )
+    {
+        data.SetInitialFont(fontInit);
+    }
+
+    wxFont fontRet;
+    wxFontDialog dialog(parent, data);
+    if (!caption.empty())
+        dialog.SetTitle(caption);
+    if ( dialog.ShowModal() == wxID_OK )
+    {
+        fontRet = dialog.GetFontData().GetChosenFont();
+    }
+    //else: leave it invalid
+
+    return fontRet;
+}
+#endif // wxUSE_FONTDLG