From 302674fe1712a4abfa00203f91d13cb977007c8c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 6 Feb 2011 01:01:09 +0000 Subject: [PATCH] Use better title by default in wxDocPrintout. Use the document name instead of the default "Printout" if no title is explicitly specified when creating wxDocPrintout. Closes #12885. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/docview.h | 2 +- src/common/docview.cpp | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/include/wx/docview.h b/include/wx/docview.h index 78038de..6cf9441 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -922,7 +922,7 @@ private: class WXDLLIMPEXP_CORE wxDocPrintout : public wxPrintout { public: - wxDocPrintout(wxView *view = NULL, const wxString& title = _("Printout")); + wxDocPrintout(wxView *view = NULL, const wxString& title = wxString()); // implement wxPrintout methods virtual bool OnPrintPage(int page); diff --git a/src/common/docview.cpp b/src/common/docview.cpp index 86d1783..162a175 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -1976,8 +1976,27 @@ bool wxDocChildFrameAnyBase::CloseView(wxCloseEvent& event) #if wxUSE_PRINTING_ARCHITECTURE +namespace +{ + +wxString GetAppropriateTitle(const wxView *view, const wxString& titleGiven) +{ + wxString title(titleGiven); + if ( title.empty() ) + { + if ( view && view->GetDocument() ) + title = view->GetDocument()->GetUserReadableName(); + else + title = _("Printout"); + } + + return title; +} + +} // anonymous namespace + wxDocPrintout::wxDocPrintout(wxView *view, const wxString& title) - : wxPrintout(title) + : wxPrintout(GetAppropriateTitle(view, title)) { m_printoutView = view; } -- 2.7.4