X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68df211faedeabdf4259858109d1bd7385fdccf5..8e7cb70ce34a3ba10fed3a7a708d66543eb314a6:/include/wx/gtk/gnome/gprint.h diff --git a/include/wx/gtk/gnome/gprint.h b/include/wx/gtk/gnome/gprint.h index 9397e2f3af..280380270b 100644 --- a/include/wx/gtk/gnome/gprint.h +++ b/include/wx/gtk/gnome/gprint.h @@ -38,7 +38,8 @@ public: virtual bool TransferTo( wxPrintData &data ); virtual bool TransferFrom( const wxPrintData &data ); - virtual bool Ok() const { return true; } + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const { return true; } GnomePrintConfig* GetPrintConfig() { return m_config; } void SetPrintJob( GnomePrintJob *job ) { m_job = job; } @@ -98,7 +99,7 @@ public: wxGnomePrintDialog( wxWindow *parent, wxPrintDialogData* data = NULL ); wxGnomePrintDialog( wxWindow *parent, wxPrintData* data); - ~wxGnomePrintDialog(); + virtual ~wxGnomePrintDialog(); wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); } @@ -138,7 +139,7 @@ class wxGnomePageSetupDialog: public wxPageSetupDialogBase public: wxGnomePageSetupDialog( wxWindow *parent, wxPageSetupDialogData* data = NULL ); - ~wxGnomePageSetupDialog(); + virtual ~wxGnomePageSetupDialog(); virtual wxPageSetupDialogData& GetPageSetupDialogData(); @@ -198,9 +199,10 @@ class wxGnomePrintDC: public wxDC { public: wxGnomePrintDC( wxGnomePrinter *printer ); - ~wxGnomePrintDC(); + virtual ~wxGnomePrintDC(); - bool Ok() const; + bool Ok() const { return IsOk(); } + bool IsOk() const; bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style=wxFLOOD_SURFACE ); bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const; @@ -285,6 +287,8 @@ private: wxGnomePrinter *m_printer; GnomePrintContext *m_gpc; + void makeEllipticalPath(wxCoord x, wxCoord y, wxCoord width, wxCoord height); + private: wxCoord XDEV2LOG(wxCoord x) const {