don't use _() as default parameter for wxPrintDialogBase title

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

diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index 4cf036b94fc795c563a0d3687f3e747acc3f906b..dfe34ac2676ccbe83b9e8b8172cc3439c1c5b5f9 100644 (file)
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -23,10 +23,12 @@ class WXDLLEXPORT wxPrintDialogBase : public wxDialog
 {
 public:
     wxPrintDialogBase() { }
-    wxPrintDialogBase(wxWindow *parent, wxWindowID id = -1, const wxString &title = _("Print"),
-            const wxPoint &pos = wxDefaultPosition,
-            const wxSize &size = wxDefaultSize,
-            long style = wxDEFAULT_DIALOG_STYLE );
+    wxPrintDialogBase(wxWindow *parent,
+                      wxWindowID id = wxID_ANY,
+                      const wxString &title = wxEmptyString,
+                      const wxPoint &pos = wxDefaultPosition,
+                      const wxSize &size = wxDefaultSize,
+                      long style = wxDEFAULT_DIALOG_STYLE);
             
     virtual int ShowModal() = 0;
 

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 590624296f16c6711f52b4c51209ec1cd07da048..3ff2d387a9c35cc42e35da9d53f68f4425a823c1 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -277,9 +277,21 @@ wxPrintDialogData& wxPrinter::GetPrintDialogData() const
 
 IMPLEMENT_ABSTRACT_CLASS(wxPrintDialogBase, wxObject)
 
-wxPrintDialogBase::wxPrintDialogBase(wxWindow *parent, wxWindowID id, 
-    const wxString &title, const wxPoint &pos, const wxSize &size, long style ) :
-    wxDialog( parent, id, title, pos, size, style )
+wxPrintDialogBase::wxPrintDialogBase(wxWindow *parent,
+                                     wxWindowID id, 
+                                     const wxString &title,
+                                     const wxPoint &pos,
+                                     const wxSize &size,
+                                     long style)
+                 : wxDialog
+                   (
+                        parent,
+                        id,
+                        title.empty() ? wxString(_("Print")) : title,
+                        pos,
+                        size,
+                        style
+                   )
 {
 }