Restore compilation with --enable-stl, fix SetFocus with the generic control, and...

[wxWidgets.git] / include / wx / mac / carbon / dcprint.h

diff --git a/include/wx/mac/carbon/dcprint.h b/include/wx/mac/carbon/dcprint.h
index 2fe6362aefdf4a21ba0b6706994c1b3234c42ee0..79f8d3b2f750a8356ded45ca66977f9b2e033a22 100644 (file)
--- a/include/wx/mac/carbon/dcprint.h
+++ b/include/wx/mac/carbon/dcprint.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcprint.h
+// Name:        wx/mac/carbon/dcprint.h
 // Purpose:     wxPrinterDC class
 // Author:      Stefan Csomor
 // Modified by:
@@ -25,18 +25,19 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
 
   // Create a printer DC
   wxPrinterDC(const wxPrintData& printdata );
-  ~wxPrinterDC();
+  virtual ~wxPrinterDC();
 
     virtual bool StartDoc( const wxString& WXUNUSED(message) ) ;
     virtual void EndDoc(void) ;
     virtual void StartPage(void) ;
     virtual void EndPage(void) ;
+
+    wxRect GetPaperRect();
+
     wxPrintData& GetPrintData() { return m_printData; }
-    virtual void DoGetSize( int *width, int *height ) const;
-#if wxMAC_USE_CORE_GRAPHICS
-    void MacSetCGContext( void * cg ) ;
-#endif    
+    virtual wxSize GetPPI() const;
  protected:
+    virtual void DoGetSize( int *width, int *height ) const;
     wxPrintData   m_printData ;
     wxNativePrinterDC* m_nativePrinterDC ;
 #endif // wxUSE_PRINTING_ARCHITECTURE