AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made gnome printing stuff return wxPRINT_CANCELLED if

Browse Source 
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
This commit is contained in:
Robert Roebling 2005-02-11 22:16:41 +00:00
parent 67edd0c796
commit 4843cdfe0f
5 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
samples/printing/printing.cpp
View File

@ -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);

7
src/gtk/app.cpp
View File

@ -80,13 +80,6 @@
#include <gtk/gtk.h>
#if wxUSE_LIBGNOMEPRINT
#include "wx/html/forcelnk.h"
FORCE_LINK(gnome_print)
#endif
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------

2
src/gtk/gnome/gprint.cpp
View File

@ -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;
}

7
src/gtk1/app.cpp
View File

@ -80,13 +80,6 @@
#include <gtk/gtk.h>
#if wxUSE_LIBGNOMEPRINT
#include "wx/html/forcelnk.h"
FORCE_LINK(gnome_print)
#endif
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------

2
src/gtk1/gnome/gprint.cpp
View File

@ -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;
}