return NULL (and not invalid) iterator from compatibility_iterator::GetPrevious(...

[wxWidgets.git] / include / wx / gtk / gnome / gprint.h

diff --git a/include/wx/gtk/gnome/gprint.h b/include/wx/gtk/gnome/gprint.h
index 82d086b09f3ed0354127f50e4a9860ba2d6e2a69..eb5764a17010d208b545beccb5492faed6908607 100644 (file)
--- a/include/wx/gtk/gnome/gprint.h
+++ b/include/wx/gtk/gnome/gprint.h
@@ -13,15 +13,13 @@
 
 // Include wxWindows' headers
 
 
 // Include wxWindows' headers
 

-#ifndef WX_PRECOMP
-    #include <wx/wx.h>
-#endif
+#include "wx/defs.h"

 
 #if wxUSE_LIBGNOMEPRINT
 
 #include "wx/print.h"
 
 #if wxUSE_LIBGNOMEPRINT
 
 #include "wx/print.h"

-#include "wx/prntbase.h"

 #include "wx/printdlg.h"
 #include "wx/printdlg.h"

+#include "wx/dc.h"

 
 typedef struct _GnomePrintJob GnomePrintJob;
 typedef struct _GnomePrintContext GnomePrintContext;
 
 typedef struct _GnomePrintJob GnomePrintJob;
 typedef struct _GnomePrintContext GnomePrintContext;


@@ -204,9 +202,6 @@ public:
 
     bool Ok() const;
 
 
     bool Ok() const;
 

-    virtual void BeginDrawing() {}
-    virtual void EndDrawing() {}
-

     bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style=wxFLOOD_SURFACE );
     bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
     void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
     bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style=wxFLOOD_SURFACE );
     bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
     void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);


@@ -290,6 +285,8 @@ private:
     wxGnomePrinter         *m_printer;
     GnomePrintContext      *m_gpc;
 
     wxGnomePrinter         *m_printer;
     GnomePrintContext      *m_gpc;
 

+    void makeEllipticalPath(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    

 private:
     wxCoord XDEV2LOG(wxCoord x) const
     {
 private:
     wxCoord XDEV2LOG(wxCoord x) const
     {