X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/389076f14811ac2c7ad5e3ffb3685b54e8f1944b..d18868bb9b22d6f0fd1010779ddab14a6ab398d8:/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 ba03655e6d..280380270b 100644
--- a/include/wx/gtk/gnome/gprint.h
+++ b/include/wx/gtk/gnome/gprint.h
@@ -11,21 +11,15 @@
 #ifndef __gprint_H__
 #define __gprint_H__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
 // Include wxWindows' headers
 
-#ifndef WX_PRECOMP
-    #include <wx/wx.h>
-#endif
+#include "wx/defs.h"
 
 #if wxUSE_LIBGNOMEPRINT
 
 #include "wx/print.h"
-#include "wx/prntbase.h"
 #include "wx/printdlg.h"
+#include "wx/dc.h"
 
 typedef struct _GnomePrintJob GnomePrintJob;
 typedef struct _GnomePrintContext GnomePrintContext;
@@ -44,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; }
@@ -104,7 +99,7 @@ public:
     wxGnomePrintDialog( wxWindow *parent,
                          wxPrintDialogData* data = NULL );
     wxGnomePrintDialog( wxWindow *parent, wxPrintData* data);
-    ~wxGnomePrintDialog();
+    virtual ~wxGnomePrintDialog();
 
     wxPrintData& GetPrintData()
         { return m_printDialogData.GetPrintData(); }
@@ -144,7 +139,7 @@ class wxGnomePageSetupDialog: public wxPageSetupDialogBase
 public:
     wxGnomePageSetupDialog( wxWindow *parent,
                             wxPageSetupDialogData* data = NULL );
-    ~wxGnomePageSetupDialog();
+    virtual ~wxGnomePageSetupDialog();
 
     virtual wxPageSetupDialogData& GetPageSetupDialogData();
 
@@ -204,12 +199,10 @@ class wxGnomePrintDC: public wxDC
 {
 public:
     wxGnomePrintDC( wxGnomePrinter *printer );
-    ~wxGnomePrintDC();
-
-    bool Ok() const;
+    virtual ~wxGnomePrintDC();
 
-    virtual void BeginDrawing() {}
-    virtual void EndDrawing() {}
+    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;
@@ -294,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
     {