From 4843cdfe0f9b64aeb9e95266b69752c32322a493 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 11 Feb 2005 22:16:41 +0000 Subject: [PATCH] Made gnome printing stuff return wxPRINT_CANCELLED if it has been canceled. Moved the FORCE_LINK code from app.cpp to the sample as I cannot find the right place for it. We'd need an empty extrya file for ADV lib only for that. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/printing/printing.cpp | 8 +++++++- src/gtk/app.cpp | 7 ------- src/gtk/gnome/gprint.cpp | 2 +- src/gtk1/app.cpp | 7 ------- src/gtk1/gnome/gprint.cpp | 2 +- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp index e6fda218b2..5315efebea 100644 --- a/samples/printing/printing.cpp +++ b/samples/printing/printing.cpp @@ -50,6 +50,12 @@ #include "mondrian.xpm" #endif +#if wxUSE_LIBGNOMEPRINT +#include "wx/html/forcelnk.h" +FORCE_LINK(gnome_print) +#endif + + // Declare a frame MyFrame *frame = (MyFrame *) NULL; // int orientation = wxPORTRAIT; @@ -301,7 +307,7 @@ void MyFrame::Draw(wxDC& dc) dc.SetBrush(*wxCYAN_BRUSH); dc.SetPen(*wxRED_PEN); - dc.DrawRectangle(0, 30, 200, 100); + dc.DrawRoundedRectangle(0, 30, 200, 100, 20); dc.DrawText( wxT("Rectangle 200 by 100"), 40, 40); diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index e370b54665..b894f1bb1c 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -80,13 +80,6 @@ #include -#if wxUSE_LIBGNOMEPRINT - -#include "wx/html/forcelnk.h" -FORCE_LINK(gnome_print) - -#endif - //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp index 9be9ac7d62..45e9735ad3 100644 --- a/src/gtk/gnome/gprint.cpp +++ b/src/gtk/gnome/gprint.cpp @@ -795,7 +795,7 @@ wxDC* wxGnomePrinter::PrintDialog( wxWindow *parent ) int ret = dialog.ShowModal(); if (ret == wxID_CANCEL) { - sm_lastError = wxPRINTER_ERROR; + sm_lastError = wxPRINTER_CANCELLED; return NULL; } diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index e370b54665..b894f1bb1c 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -80,13 +80,6 @@ #include -#if wxUSE_LIBGNOMEPRINT - -#include "wx/html/forcelnk.h" -FORCE_LINK(gnome_print) - -#endif - //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- diff --git a/src/gtk1/gnome/gprint.cpp b/src/gtk1/gnome/gprint.cpp index 9be9ac7d62..45e9735ad3 100644 --- a/src/gtk1/gnome/gprint.cpp +++ b/src/gtk1/gnome/gprint.cpp @@ -795,7 +795,7 @@ wxDC* wxGnomePrinter::PrintDialog( wxWindow *parent ) int ret = dialog.ShowModal(); if (ret == wxID_CANCEL) { - sm_lastError = wxPRINTER_ERROR; + sm_lastError = wxPRINTER_CANCELLED; return NULL; } -- 2.45.2