X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..e9e8b38179b147dd04f5c19af7e56a94342e93a7:/include/wx/gtk/print.h diff --git a/include/wx/gtk/print.h b/include/wx/gtk/print.h index 795cf71ccf..12647b4463 100644 --- a/include/wx/gtk/print.h +++ b/include/wx/gtk/print.h @@ -174,7 +174,7 @@ private: wxDC *m_dc; DECLARE_DYNAMIC_CLASS(wxGtkPrinter) - DECLARE_NO_COPY_CLASS(wxGtkPrinter) + wxDECLARE_NO_COPY_CLASS(wxGtkPrinter); }; //---------------------------------------------------------------------------- @@ -196,7 +196,6 @@ public: GtkPrintSettings* GetPrintConfig() { return m_config; } void SetPrintConfig( GtkPrintSettings * config ); - void SetPrintJob( GtkPrintOperation *job ) { m_job = job; } GtkPrintOperation* GetPrintJob() { return m_job; } GtkPrintContext *GetPrintContext() { return m_context; } @@ -255,7 +254,7 @@ public: virtual wxRect GetPaperRect() const; protected: - bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, + bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, wxFloodFillStyle style=wxFLOOD_SURFACE ); void DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter); void DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection = wxEAST); @@ -275,7 +274,7 @@ protected: void DoDrawSpline(const wxPointList *points); #endif bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, + wxDC *source, wxCoord xsrc, wxCoord ysrc, wxRasterOperationMode rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ); @@ -315,7 +314,7 @@ private: double m_DEV2PS; DECLARE_DYNAMIC_CLASS(wxGtkPrinterDCImpl) - DECLARE_NO_COPY_CLASS(wxGtkPrinterDCImpl) + wxDECLARE_NO_COPY_CLASS(wxGtkPrinterDCImpl); }; // ----------------------------------------------------------------------------