diff --git a/xvaga/xvtextra.cpp b/xvaga/xvtextra.cpp
index d31b82b15..9e1b2fe0a 100755
--- a/xvaga/xvtextra.cpp
+++ b/xvaga/xvtextra.cpp
@@ -1,6 +1,7 @@
 #include "wxinc.h"
-#include "wx/print.h"
-#include "wx/tokenzr.h"
+#include <wx/print.h>
+#include <wx/tokenzr.h>
+#include <wx/filename.h>
 
 #include "xvt.h"
 
@@ -224,11 +225,14 @@ wxDC* TwxPrintOut::CreateDC(const TPRINT_RCD* prcd, const char* title)
       wxWindow* pStatic = pAbort->FindWindow(wxID_STATIC);
       if (pStatic != NULL)
       {
-        wxString strPrompt = wxT("Stampa su ");
+        wxString strPrompt 
         if (IsPDF())
-          strPrompt += wxT("PDF");
+        {
+          const wxFileName fn(title);
+          strPrompt << wxT("Generazione di ") << fn.GetFullName();
+        }
         else
-          strPrompt += PrinterName();
+          strPrompt << wxT("Stampa su ") << PrinterName();
         pStatic->SetLabel(strPrompt);
       }
     }
@@ -764,13 +768,17 @@ void TwxPrintAbortDialog::Pulse()
 }
 
 TwxPrintAbortDialog::TwxPrintAbortDialog()
-: wxPrintAbortDialog(NULL, wxT("Stampa"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
+                   : wxPrintAbortDialog(NULL, wxT("Stampa"), 
+                                        wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 {
   wxBoxSizer *button_sizer = new wxBoxSizer( wxVERTICAL );
 
-  button_sizer->Add(new wxStaticText(this, wxID_STATIC, wxT("Stampa in corso..."), wxDefaultPosition, wxSize(320,-1)), 0, wxALL, 10 );
-  button_sizer->Add(new wxGauge(this, wxID_FORWARD, 1, wxDefaultPosition, wxSize(320,-1)), 0, wxALL, 10 );
-  button_sizer->Add(new wxButton(this, wxID_CANCEL, wxT("Annulla") ), 0, wxALL | wxALIGN_CENTER, 10 );
+  button_sizer->Add(new wxStaticText(this, wxID_STATIC, wxT("Stampa in corso..."), 
+                                     wxDefaultPosition, wxSize(480,-1)), 0, wxALL, 10 );
+  button_sizer->Add(new wxGauge(this, wxID_FORWARD, 1, wxDefaultPosition, wxSize(480,-1)), 0, wxALL, 10 );
+
+  //button_sizer->Add(new wxButton(this, wxID_CANCEL, wxT("Annulla") ), 0, wxALL | wxALIGN_CENTER, 10 );
+  button_sizer->Add(new wxBitmapButton(this, wxID_CANCEL, _GetToolResource(102,32) ), 0, wxALL | wxALIGN_CENTER, 10 );
 
   SetAutoLayout(true);
   SetSizer(button_sizer);
diff --git a/xvaga/xvtpdf.h b/xvaga/xvtpdf.h
index e00ce3541..b2b10b193 100755
--- a/xvaga/xvtpdf.h
+++ b/xvaga/xvtpdf.h
@@ -99,7 +99,8 @@ public:
   void SetPrintData(const wxPrintData& data) { m_printData = data; }
 
   virtual int GetDepth() const { return 24; }
-    
+  const wxString& OutputFile() const { return m_fileName; }
+
 protected:
 
   void SetFontColor(const wxColor& color) const;