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
This commit is contained in:
@@ -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);
|
||||
|
||||
|
Reference in New Issue
Block a user