X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f37154e988c597e32a840e43783cf0b23e5f8b4..5179bc0bca526f0297d8930838ad4112faa967cd:/include/wx/gtk/gnome/gprint.h

diff --git a/include/wx/gtk/gnome/gprint.h b/include/wx/gtk/gnome/gprint.h
index 7e8b421adf..0901dae2e7 100644
--- a/include/wx/gtk/gnome/gprint.h
+++ b/include/wx/gtk/gnome/gprint.h
@@ -92,7 +92,7 @@ public:
                                                           wxPageSetupDialogData * data = NULL );
 
 #if wxUSE_NEW_DC
-    virtual wxImplDC* CreatePrinterImplDC( wxPrinterDC *owner, const wxPrintData& data );
+    virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );
 #else
     virtual wxDC* CreatePrinterDC( const wxPrintData& data );
 #endif
@@ -212,19 +212,19 @@ private:
 //-----------------------------------------------------------------------------
 
 #if wxUSE_NEW_DC
-class wxGnomePrinterImplDC : public wxImplDC
+class wxGnomePrinterDCImpl : public wxDCImpl
 #else
-#define wxGnomePrinterImplDC wxGnomePrinterDC
+#define wxGnomePrinterDCImpl wxGnomePrinterDC
 class wxGnomePrinterDC : public wxDC
 #endif
 {
 public:
 #if wxUSE_NEW_DC
-    wxGnomePrinterImplDC( wxPrinterDC *owner, const wxPrintData& data );
+    wxGnomePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data );
 #else
     wxGnomePrinterDC( const wxPrintData& data );
 #endif
-    virtual ~wxGnomePrinterImplDC();
+    virtual ~wxGnomePrinterDCImpl();
 
     bool Ok() const { return IsOk(); }
     bool IsOk() const;
@@ -265,7 +265,7 @@ protected:
     void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
 #if wxUSE_SPLINES
     void DoDrawSpline(const wxPointList *points);
-#endif 
+#endif
     bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
             wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false,
             wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
@@ -274,7 +274,10 @@ protected:
     void DoDrawText(const wxString& text, wxCoord x, wxCoord y );
     void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
     void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    void DoSetClippingRegionAsRegion( const wxRegion &WXUNUSED(clip) ) { }
+    void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip) )
+    {
+        wxFAIL_MSG( "not implemented" );
+    }
     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                      wxCoord *descent = (wxCoord *) NULL,
                      wxCoord *externalLeading = (wxCoord *) NULL,
@@ -286,8 +289,8 @@ protected:
     wxPrintData& GetPrintData() { return m_printData; }
 
     // overriden for wxPrinterDC Impl
-    virtual wxRect GetPaperRect();
-    virtual int GetResolution();
+    virtual wxRect GetPaperRect() const;
+    virtual int GetResolution() const;
 
 private:
     wxPrintData             m_printData;
@@ -298,7 +301,7 @@ private:
     unsigned char           m_currentRed;
     unsigned char           m_currentGreen;
     unsigned char           m_currentBlue;
-    
+
     double                  m_pageHeight;
 
     GnomePrintContext      *m_gpc;
@@ -307,8 +310,8 @@ private:
     void makeEllipticalPath(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGnomePrinterImplDC)
-    DECLARE_NO_COPY_CLASS(wxGnomePrinterImplDC)
+    DECLARE_DYNAMIC_CLASS(wxGnomePrinterDCImpl)
+    DECLARE_NO_COPY_CLASS(wxGnomePrinterDCImpl)
 };
 
 // ----------------------------------------------------------------------------