Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxPrintDialog when used directly, closes #16821

Browse Source
This commit is contained in:
Paul Cornett
2015-05-11 10:15:05 -07:00
parent 0a6b08cca3
commit bc3f5503db
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gtk/print.cpp
View File

@@ -32,7 +32,6 @@
#include "wx/fontutil.h" #include "wx/fontutil.h"
#include "wx/dynlib.h" #include "wx/dynlib.h"
#include "wx/paper.h" #include "wx/paper.h"
#include "wx/scopeguard.h"
#include "wx/modalhook.h" #include "wx/modalhook.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
@@ -612,6 +611,11 @@ wxGtkPrintDialog::wxGtkPrintDialog( wxWindow *parent, wxPrintDialogData *data )
m_parent = parent; m_parent = parent;
SetShowDialog(true); SetShowDialog(true);
const wxPrintData& printData = m_printDialogData.GetPrintData();
wxGtkPrintNativeData* native =
static_cast<wxGtkPrintNativeData*>(printData.GetNativeData());
native->SetPrintJob(gtk_print_operation_new());
} }
wxGtkPrintDialog::wxGtkPrintDialog( wxWindow *parent, wxPrintData *data ) wxGtkPrintDialog::wxGtkPrintDialog( wxWindow *parent, wxPrintData *data )
@@ -625,11 +629,22 @@ wxGtkPrintDialog::wxGtkPrintDialog( wxWindow *parent, wxPrintData *data )
m_parent = parent; m_parent = parent;
SetShowDialog(true); SetShowDialog(true);
const wxPrintData& printData = m_printDialogData.GetPrintData();
wxGtkPrintNativeData* native =
static_cast<wxGtkPrintNativeData*>(printData.GetNativeData());
native->SetPrintJob(gtk_print_operation_new());
} }
wxGtkPrintDialog::~wxGtkPrintDialog() wxGtkPrintDialog::~wxGtkPrintDialog()
{ {
const wxPrintData& printData = m_printDialogData.GetPrintData();
wxGtkPrintNativeData* native =
static_cast<wxGtkPrintNativeData*>(printData.GetNativeData());
GtkPrintOperation* printOp = native->GetPrintJob();
g_object_unref(printOp);
native->SetPrintJob(NULL);
} }
// This is called even if we actually don't want the dialog to appear. // This is called even if we actually don't want the dialog to appear.
@@ -921,10 +936,9 @@ bool wxGtkPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
wxPrintData printdata = GetPrintDialogData().GetPrintData(); wxPrintData printdata = GetPrintDialogData().GetPrintData();
wxGtkPrintNativeData *native = (wxGtkPrintNativeData*) printdata.GetNativeData(); wxGtkPrintNativeData *native = (wxGtkPrintNativeData*) printdata.GetNativeData();
wxGtkObject<GtkPrintOperation> printOp(gtk_print_operation_new()); // wxGtkPrintDialog needs to be created first as it creates the PrintOp
native->SetPrintJob(printOp); wxGtkPrintDialog dialog(parent, &m_printDialogData);
wxON_BLOCK_EXIT_OBJ1(*native, wxGtkPrintNativeData::SetPrintJob, GtkPrintOperation* printOp = native->GetPrintJob();
static_cast<GtkPrintOperation*>(NULL));
wxPrinterToGtkData dataToSend; wxPrinterToGtkData dataToSend;
dataToSend.printer = this; dataToSend.printer = this;
@@ -937,7 +951,6 @@ bool wxGtkPrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
// This is used to setup the DC and // This is used to setup the DC and
// show the dialog if desired // show the dialog if desired
wxGtkPrintDialog dialog( parent, &m_printDialogData );
dialog.SetPrintDC(m_dc); dialog.SetPrintDC(m_dc);
dialog.SetShowDialog(prompt); dialog.SetShowDialog(prompt);