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 345be35fb9a8adac0f9e578fd6264c9f49c1fd83..79f8d3b2f750a8356ded45ca66977f9b2e033a22 100644 (file)
--- a/include/wx/mac/carbon/dcprint.h
+++ b/include/wx/mac/carbon/dcprint.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcprint.h
+// Name:        wx/mac/carbon/dcprint.h
 // Purpose:     wxPrinterDC class
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DCPRINT_H_
 #define _WX_DCPRINT_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dcprint.h"
-#endif
-
 #include "wx/dc.h"
 #include "wx/cmndata.h"
 
@@ -24,21 +20,24 @@ class wxNativePrinterDC ;
 class WXDLLEXPORT wxPrinterDC: public wxDC
 {
  public:
+#if wxUSE_PRINTING_ARCHITECTURE
   DECLARE_CLASS(wxPrinterDC)
 
-#if wxUSE_PRINTING_ARCHITECTURE
   // 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;
-    
+    virtual wxSize GetPPI() const;
  protected:
+    virtual void DoGetSize( int *width, int *height ) const;
     wxPrintData   m_printData ;
     wxNativePrinterDC* m_nativePrinterDC ;
 #endif // wxUSE_PRINTING_ARCHITECTURE