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

Upport latest changes from 2_8 branch (print dialog

Browse Source 
values settable and clipping)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-05-26 22:27:58 +00:00
parent ff9bb105a0
commit 3b7ab6bda8
2 changed files with 172 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/gtk/gnome/gprint.h
View File

@@ -179,10 +179,7 @@ public:
virtual wxDC* PrintDialog(wxWindow *parent);
virtual bool Setup(wxWindow *parent);
GnomePrintContext *GetPrintContext() { return m_gpc; }
private:
GnomePrintContext *m_gpc;
bool m_native_preview;
private:
@@ -197,7 +194,6 @@ private:
class wxGnomePrintDC: public wxDC
{
public:
wxGnomePrintDC( wxGnomePrinter *printer );
wxGnomePrintDC( const wxPrintData& data );
virtual ~wxGnomePrintDC();
@@ -262,8 +258,8 @@ protected:
void DoGetSize(int* width, int* height) const;
void DoGetSizeMM(int *width, int *height) const;
void SetPrintData(const wxPrintData& data);
wxPrintData& GetPrintData() { return m_printData; }
void SetPrintData(const wxPrintData& data) { m_printData = data; }
private:
static float ms_PSScaleFactor;
@@ -280,9 +276,8 @@ private:
int m_deviceOffsetY;
wxGnomePrinter *m_printer;
GnomePrintContext *m_gpc;
GnomePrintJob* m_job; // only used and destroyed when created with wxPrintData
GnomePrintJob* m_job;
void makeEllipticalPath(wxCoord x, wxCoord y, wxCoord width, wxCoord height);