X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3498362ed5759522a9664a70e4da819e51bd2fbe..aa767a452107db3fcc5773a8955927b059ccf945:/include/wx/gtk/gnome/gprint.h?ds=sidebyside diff --git a/include/wx/gtk/gnome/gprint.h b/include/wx/gtk/gnome/gprint.h index 60b1c7bea5..d2d1ee6948 100644 --- a/include/wx/gtk/gnome/gprint.h +++ b/include/wx/gtk/gnome/gprint.h @@ -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(); @@ -258,12 +254,12 @@ protected: void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = (wxCoord *) NULL, wxCoord *externalLeading = (wxCoord *) NULL, - wxFont *theFont = (wxFont *) NULL ) const; + const wxFont *theFont = (wxFont *) NULL ) const; 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; @@ -277,15 +273,14 @@ private: unsigned char m_currentRed; unsigned char m_currentGreen; unsigned char m_currentBlue; - + 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); - + private: wxCoord XDEV2LOG(wxCoord x) const {